[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 33ce5ab56c -s ours am: 57d537df67 -s ours

am skip reason: Change-Id Id8c597d5d892b67646744fbcad651a7f9df13159 with SHA-1 94814967dd is in history

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

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