Merge "Camera2: Add @hide variant for openCamera for UID forwarding" into nyc-mr1-dev