[automerger skipped] Merge 10952656 am: 6b42407936 -s ours am: fc3f747c01 -s ours

am skip reason: Merged-In I74253637ce2d9607336207334322b7df16e1a2ba with SHA-1 b457ec358b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/camera/+/25089415

Change-Id: If67152556d64b62256df89ca58ac8fb33ccff3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>