Merge "Enforce ComponentName belongs to caller app" into tm-dev am: 483a3cab86 am: bc22507901

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

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