[automerger skipped] Merge "wifi: HIDL/AIDL register networks when p2p dev interface added" into tm-qpr-dev am: 67e53f8024 am: 958ee83d8f -s ours

am skip reason: Merged-In Ib61459774d9afe236c4cc09023b87d718f23b831 with SHA-1 e2206be29d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/19237989

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