Merge "camera2: Update spec for android.colorCorrection.* in metadata"