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

Merge "[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into rvc-dev am: c4d258d8 am: b6cff0c1 -s ours am: 54f95db1 -s ours am: 68e35589 -s ours am: 21837b3b -s ours am: 0ad71dcc -s ours am: d42d0fec -s ours" into tm-qpr-dev-plus-aosp