Merge "Cleanup the mainline supplicant AIDL interface." into main