Merge \\"Camera2: Add @hide variant for openCamera for UID forwarding\\" into nyc-mr1-dev am: 8c22370331
am: 9b74b46034

Change-Id: I870e4adb3377dcd9ef4d51f15c7ebe23ef1b78e1