Merge "Fix policy transparency for camera disabled policy" into udc-dev