Merge "Merge "PackageManager: Restrict some camera intents to MATCH_SYSTEM_ONLY" into rvc-dev am: 9bbdb759d8" into rvc-dev-plus-aosp am: 55eec9a5b2 am: 2ef42bddeb

Change-Id: If26a9e2e9db84188173f0a1c460bb7df564342b7