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

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

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