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

Merge "[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into sc-dev am: 70530072 -s ours am: b5c51a7b -s ours am: fe044161 -s ours am: d547b26d -s ours" into tm-d1-dev-plus-aosp am: c83af5b2 -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: I16f8d1a6dcd68e395a43891aaef0acb37aec9262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>