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

[automerger skipped] Merge "Merge "Enforce ComponentName belongs to caller app" into tm-dev am: 483a3cab am: bc225079" into tm-d1-dev-plus-aosp am: 9be18194 -s ours am: f8a36e3f -s ours

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

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



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