[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d3b2f71bea -s ours am: 2c81fadb68 -s ours am: 555eddf741 -s ours am: 013bebd5ec -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: I40667f94fb035d49ab34db95bc010ff30fe9c8a9