[automerger skipped] Merge "DO NOT MERGE: Add blacklist for camera protection" into qt-qpr1-dev am: d28b13cb43 -s ours

am skip reason: subject contains skip directive

Change-Id: I2acfcb04c4811374584fbbbcdd2366ece921871c