aml_go_odp_330912000
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: f3fa139aca -s ours am: 6dcc83f9bf -s ours

am skip reason: Merged-In I4ae4e27d2950ed9620dc02b077370d7d748a7f20 with SHA-1 d2fbc95b18 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/art/+/16843514

Change-Id: I9d47cab3df1ec03083e79094bee4b9852bb710c4