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

Change-Id: Icf80e7e00259e032824826974106366e2cc67e77