Merge "Fix for dropping p2p group remove event in HIDL" into sc-dev