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: e929052d -s ours am: 4ecbabc9 -s ours am: ef7e3951 -s ours am: 1a860bc6 -s ours am: 55592f1b -s ours" into udc-dev am: 9bd38e95 -s ours am: f3905652 -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: I346893b6fe6069b553d53969e2634f2c98b4256c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>