Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: bb33ac1f3b

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

Change-Id: If5a5c6d3e961fee4d5edb525998b8adccc5f3ac9