tree 3f4ef08f6c486bd4ba36c29cf81257395ca84e25
parent 0b8ee9ae508ca5b5467600cf25c0667b437f7b5f
parent 1ea67b0c986d1ef6709b9f388c479fbda82f7fd5
author Nikita Ioffe <ioffe@google.com> 1618835625 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618835625 +0000

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

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

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

Change-Id: I43711ad22c4c102f2a325324b0a9ce30c6070008