[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f4aa266d89 -s ours am: ceeb4cfdfe -s ours

am skip reason: Merged-In Id3aa2d100d8a176149212d31b6b2c23fe5f2e904 with SHA-1 b5b9e810bf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17545206

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