[automerger skipped] DO NOT MERGE Merge "Update vndk list with dice hal...

[automerger skipped] DO NOT MERGE Merge "Update vndk list with dice hal libraries." am: 06c7e31f am: 608be6d5 am: cfebdda7 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16492637

Change-Id: I4bbb4be93e5efbb5e44de76b86a628d4f493cf55