[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: a74b2d32 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6b5e66c10ed378dc78744320c3e1ce908e5d81df