Merge "sepolicy: Make wpa_supplicant a HIDL service"