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