[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into...

[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into rvc-dev am: c4d258d8 am: b6cff0c1 -s ours am: 54f95db1 -s ours am: 68e35589 -s ours

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

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



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