Merge "Camera: Add CaptureResult#getCameraId()"