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

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

Change-Id: Ie67708a6c193baf88379af8dc5839a50ac23f932