[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 69a7e2e2c3 -s ours am: 7be1056456 -s ours

am skip reason: Merged-In I610ba6eb7fc297d6c21ebbf9829eaca5483d76f4 with SHA-1 174b0427a0 is already in history

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

Change-Id: I47ecdc1918b32d9ede233179f2a3b22bf2266b3b
tree: e0969b537a5855738e399f682f45df5438a0fc70
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS