[automerger skipped] Merge "Prevent apk-in-apex from being registered under wrong apex" into rvc-qpr-dev am: 21d910e0 am: 1ea67b0c -s ours am: c28f00cb -s ours

am skip reason: skip tag Change-Id Idc989ac84777589b4bdd72012833cdbdab7e872c with SHA-1 c45a426e is already in history

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

Change-Id: Ied37be8e403805ddad7cc4d483c742e9cfb3f5e2