[automerger skipped] Merge Android U (ab/10368041) am: 83176c1ddf -s ours am: 34d58386bb -s ours am: 7a728026de -s ours

am skip reason: Merged-In I84ce0bfd90dc142b01536bb71213048e9f27473e with SHA-1 c63c6d0c3b is already in history

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

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