[automerger skipped] Merge changes from topic "cp-libwifihal-soong" am:...

[automerger skipped] Merge changes from topic "cp-libwifihal-soong" am: 08f3ea9e am: 4cb903bd am: e7112054 am: d388f141 -s ours

am skip reason: Merged-In I5353ab1561622eae12e2dff87eb0f17b47c3773d with SHA-1 eb6bd6a7 is already in history

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



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