Merge "Merge "PackageManager: Restrict some camera intents to...
Merge "Merge "PackageManager: Restrict some camera intents to MATCH_SYSTEM_ONLY" into rvc-dev am: 9bbdb759" into rvc-dev-plus-aosp am: 55eec9a5 am: 2ef42bdd
Change-Id: If26a9e2e9db84188173f0a1c460bb7df564342b7