[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 07d415ff37 -s ours

am skip reason: Merged-In I8c2bdef3e3cfe107b13dade69e33ce48fda5d713 with SHA-1 7a0900bfbf is already in history

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

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