[automerger skipped] Merge "DO NOT MERGE: Add blacklist for camera protection" into qt-qpr1-dev am: d28b13cb43 -s ours am: 7af1f72f14
Change-Id: I3e2c4dddb14f57aeadf64ffe5573b4c1a63455b9
This commit is contained in: