[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 182d45e965 -s ours am: 38638a40c9 -s ours

am skip reason: Merged-In If0363f5241d7cc10b59cfc7f3643d0b291c04ac0 with SHA-1 533dc4dcd0 is already in history

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

Change-Id: I6e66ede80440f734db73365c9069c6e75bf0e778