Merge "Add blacklist for camera protection" into rvc-dev am: 85ee54cc46

Change-Id: I3abad8e0af06d08440ddc71193afbe1132cc22f4