[automerger skipped] Merge 10952656 am: b4230be81c -s ours am: 4b36941338 -s ours

am skip reason: Merged-In I45b68b89af5f9cbc09d9d3809fbf71876cc8f2cf with SHA-1 863d640e58 is already in history

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

Change-Id: I9233aa0a8498331678a5b396fe3c473d7bf5995e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: c614154c7ebd6dba30b3d0052681d1a868b6ef14
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS