[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into rvc-dev am: c4d258d8b1 am: b6cff0c175 -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: Id8fafb68f11b1c94cf3f8bfb191803675aad4250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>