Merge "[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into rvc-dev am: c4d258d8b1 am: b6cff0c175 -s ours am: 54f95db1cf -s ours am: 68e3558965 -s ours am: 21837b3bc0 -s ours am: 0ad71dcc49 -s ours" into tm-d1-dev-plus-aosp