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

[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed -s ours am: 53f19e61 -s ours am: 8ae2b04d -s ours am: f3eb39a1 -s ours am: 4d54528b -s ours am: 8dba96b3 -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/+/19773959



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