[automerger skipped] [automerge] Enforce ComponentName belongs to caller app...

[automerger skipped] [automerge] Enforce ComponentName belongs to caller app 2p: b479180b am: 2e641315 -s ours am: 36048a39 -s ours am: be32fd39 -s ours

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

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



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