Merge "camera2: Add physical camera id in CaptureResult"