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