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

Change-Id: I459a744a78ebf289c180aacddcb47ae822da4822