[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: 9dad574d -s ours am: a6fce7e1 -s ours am: 780c568f -s ours am: 2d3d1c97 -s ours am: 46da8bd8 -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: Ibf0b6a9ef11cbd91d87f4f72db494f0cdba792e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>