[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1a1fa68a7b -s ours am: 8a5061e6fb -s ours am: 0a3d631834 -s ours

am skip reason: Merged-In I13a88a6a0a569c90a10e2d456b0b97ad5ddd3d71 with SHA-1 503af3a70d is already in history

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

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