Merge "[automerger skipped] Merge "DO NOT MERGE: Add blacklist for camera...

Merge "[automerger skipped] Merge "DO NOT MERGE: Add blacklist for camera protection" into qt-qpr1-dev am: d28b13cb -s ours am: 7af1f72f am: 802cc062" into rvc-d1-dev-plus-aosp am: 411c3250 am: 036a1443 -s ours

am skip reason: subject contains skip directive

Change-Id: I6fb2c03f6bf585bd8e7134d892afaf97ab9d773e