[automerger skipped] Merge "[IRadioConfig] Add to VNDK variant list" am: 0f7dddcc9c -s ours

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

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

Change-Id: Ida100b11896d6dcf3db9f804141e0eca6717a007