[automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 84b3aebcd3 am: 3287c967e7 -s ours

am skip reason: Merged-In I2ec5fd036af1d35c6d3fe000ee41f3347f9aea41 with SHA-1 8914ae87de is already in history

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

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