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

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

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