[automerger skipped] Merge "Merge Android 12" am: 0b55aed83b -s ours

am skip reason: Merged-In I0c3c2efd9dc8b5e7d5bbaa33723b1921e680ab8c with SHA-1 440d9d5afc is already in history

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

Change-Id: I8eec33ef04d2aeefa142bef0e64c64ede7657a26
tree: 130d6360024a00bfc826ef306a28751262eee244
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml