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

Change-Id: Ie03815d4793fd432f8e49d2119d2a9478bdd4332