[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours am: 489f92832d -s ours am: 3bf1fa1198 -s ours am: 96cdee8978 -s ours am: feef24932a -s ours

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

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

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