[automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: d01f1603a7 -s ours am: 0eda1cfb23 -s ours

am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history

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

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