Merge "PackageManager: Restrict some camera intents to MATCH_SYSTEM_ONLY" into rvc-dev am: 9bbdb759d8 am: 641ccdf67c

Change-Id: Ia0d136f7cf6d5f7335b249394d86eff8d511ac99