[automerger skipped] Merge Android 14 QPR1 am: 91b06aa512 -s ours am: ab7b3f6c2b -s ours am: eab8388e49 -s ours

am skip reason: Merged-In I5259eac6081347d19b0658566ce4c1d73ee1974f with SHA-1 9388fc8f5e is already in history

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

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