[automerger skipped] [automerge] Enforce ComponentName belongs to caller app 2p: b479180b73 am: 2e641315bf -s ours am: 36048a39fe -s ours

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

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

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