Merge "Fix for dropping p2p group remove event in HIDL" into sc-dev am: fac34aee1d am: b9cfb0ae04 am: f5467c44fe

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

Change-Id: Iefabad543848dc690c94103b9a001e2d16854a1d