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

[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into tm-dev am: dd5160a2 -s ours am: fcd6a07c -s ours am: 9321b9af -s ours

am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be991 is already in history. Merged-In was found from reverted change.

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



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