Merge "Prevent apk-in-apex from being registered under wrong apex" into rvc-qpr-dev am: 21d910e0

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

Change-Id: I296b1d98f4268773f712c4b7167cd291d4731c94