Merge changes from topic "cp-libwifihal-soong" am: 08f3ea9e97 am: 4cb903bdcb

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

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