[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1938e6d3fb -s ours

am skip reason: Merged-In Ic8ce9767ea0075cc28d814a284a579b113bb7420 with SHA-1 1a56ac36d8 is already in history

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

Change-Id: I9bcb89f59ea4e28fa8b8e77be210b1180f042cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 130d6360024a00bfc826ef306a28751262eee244
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml