Merge changes from topic "presubmit-am-c30953f65a604e94bbd452f23524405d" into sc-qpr1-dev am: f321ce1160

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457

Change-Id: I78eac83826d4adae2489ab4adbc4d4a358961c6f