Merge mainline-release 6664920 to master - DO NOT MERGE am: 38344cc5d1

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

Change-Id: I28c30d8e4a88a802c64d7163311204a8fdb4bfc4