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

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

Change-Id: I2bfcd0832ad7db3e8ae251b5cab2323238010756