[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 94601bb987 -s ours am: 574c98c925 -s ours am: 265fe314e2 -s ours

am skip reason: Change-Id Icf5e0a7e5ca76ead5dd686a2c26da0f0db5e16f9 with SHA-1 6290d40e02 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/12485048

Change-Id: I26a1bb040445832183d43eebed5e7298eb563def