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

[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into sc-dev am: 70530072 -s ours am: e711745a -s ours am: 9fbc372e -s ours am: 073d5349 -s ours am: 6486a466 -s ours am: f02444f0 -s ours am: 3238e1c9 -s ours

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

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



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