[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 440d9d5afc -s ours

am skip reason: Merged-In I279b8ef4746d78ca1cb57bda6399fee3cc695f2c with SHA-1 9717d5cf34 is already in history

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

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