Merge "Fix CaptureResultTest#testCameraCaptureResultAllKeys" into main