Merge "Fix for dropping p2p group remove event in HIDL" into sc-dev am: fac34aee1d am: 8d98edfc78 am: abe1c6e7b6

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

Change-Id: I402e87cbfca2f26b5045ae98ad830da1fe1132e4