[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 22232e99f7 -s ours am: 8416a63dd4 -s ours

am skip reason: Merged-In I276f3a2d55527e048aa3c3cb60414a5676372010 with SHA-1 665260523d is already in history

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

Change-Id: Iae4886d822d8f58831f118d812c6f5707f763d73