Merge "Merge "Fix original-package support" into rvc-dev am: ab6c4a76 am: a5566005" into rvc-d1-dev-plus-aosp