Merge changes from topic 'b/34853980'

* changes:
  Camera: Add createCustomCameraSession to system API.
  CameraDevice: Add hidden createCustomCaptureSession