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

Merge "Merge "Fix original-package support" into rvc-dev am: ab6c4a76 am: 05f76520" into rvc-d1-dev-plus-aosp am: 27b648d5 am: ed7c0cc7

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

Change-Id: I63e89c345b0ffe9fb07906f1a6909441559f3340