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

Change-Id: I55a21fc5f413a16831c2abc17dcabb9ae832c0b7