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

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

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