[automerger skipped] Merge "[IRadioConfig] Add to VNDK variant list" am:...

[automerger skipped] Merge "[IRadioConfig] Add to VNDK variant list" am: 0f7dddcc -s ours am: af59d812 -s ours am: 513137d5 -s ours am: da182fac -s ours

am skip reason: Merged-In Ibacc996f42c4bfa12b135247a2cebe1e28bbff09 with SHA-1 af68148d is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828136

Change-Id: I86dcdfd769acc653898bbab37f92544537f980f8