[automerger skipped] Merge changes from topic "cp-libwifihal-soong" into tm-qpr-dev-plus-aosp am: 4d87b2ee -s ours

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

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



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