Merge "AOSP counterpart of wifi hal apex" am: 2b49939f33 am: fad5dead0f am: 763c1896ab am: 22f5a24b17

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

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