Merge changes from topic "presubmit-am-877e172c4fa74f85876fa80ed0ef9e2b" into tm-mainline-prod

* changes:
  [automerge] Camera: Validate physical setting map in OutputConfiguration.writeParcel 2p: 231f7b67ff
  Camera: Validate physical setting map in OutputConfiguration.writeParcel

core/java/android/hardware/camera2/CaptureRequest.java

@@ -623,6 +623,11 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
+        if (!mPhysicalCameraSettings.containsKey(mLogicalCameraId)) {
+            throw new IllegalStateException("Physical camera settings map must contain a key for "
+                    + "the logical camera id.");
+        }
+
         int physicalCameraCount = mPhysicalCameraSettings.size();
         dest.writeInt(physicalCameraCount);
         //Logical camera id and settings always come first.