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

[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into tm-mainline-prod am: 1f98044c -s ours

am skip reason: Merged-In I01bda0f5bf343d73c480ad64b562dd0a2ee46e30 with SHA-1 e1d26ebf is already in history

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



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