Merge "Merge "Fix original-package support" into rvc-dev am: ab6c4a76 am:...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11794000

Change-Id: I35133146f27910dfb86e9a1f5a6a8f1701d6eb34