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

am skip reason: Merged-In I1a095e8c3049420124baef139edacdfdd5747980 with SHA-1 5684435b07 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ArtPrebuilt/+/15571813

Change-Id: I48e3bbc6cac6d1dba30a36636ec9c0de1524dc79