Merge "Merge "Add blacklist for camera protection" into rvc-dev am: 85ee54cc am: fbe073f6" into rvc-d1-dev-plus-aosp