Merge 10952656 am: 9388fc8f5e am: caa677c0a8

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

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