[automerger skipped] Merge Android 14 QPR2 to AOSP main am: eb1e6714fe -s ours

am skip reason: Merged-In I5c13525b4e96d3ed916189687b98fd49232787ff with SHA-1 63a731d1a1 is already in history

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

Change-Id: I5207581db429e189b5af813b61c0178fd9826eb6
Signed-off-by: Automerger Merge Worker <[email protected]>