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

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

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

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

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