[automerger skipped] Merge "Wifi: Add support to query and use driver...

[automerger skipped] Merge "Wifi: Add support to query and use driver advertised interface combination" into udc-dev am: 87bc929e am: 360d6a98 -s ours

am skip reason: Merged-In I3bc85ac013490949aab71a00f60028bf5daee68c with SHA-1 2be1f268 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/21480350



Change-Id: I6c01b5d34ef99fda7d73408f9156b68e6ca0a52b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>