Merge changes from topic "presubmit-am-ea8f6ae2f09d4f21921b885a686f4287" into sc-dev-plus-aosp am: a9d4436b78

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

Change-Id: I73f37350e7bb575591dacf13d408cb5c29e06bc9