Merge "AOSP counterpart of wifi hal apex" am: 2b49939f33

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

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