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

Merge "[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22 am: b2434072 -s ours am: 07afb475 -s ours am: 489f9283 -s ours am: 3bf1fa11 -s ours am: 96cdee89 -s ours am: feef2493 -s ours" into tm-d1-dev-plus-aosp am: fe4b48c2 -s ours

am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf199 is already in history

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



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