[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into sc-dev am: 7053007275 -s ours am: e711745a18 -s ours am: 9fbc372e61 -s ours

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

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

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