[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into rvc-dev am: c4d258d8b1 am: b6cff0c175 -s ours am: 54f95db1cf -s ours am: 5e30a6efba -s ours am: e6c523f7e3 -s ours am: e5c7a29b7e -s ours am: 43ec497b83 -s ours

am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 b479180b73 is already in history

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

Change-Id: Ic67bcac2ef7f5a06be9847185a139844f991f4c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>