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