Merge "Improve initialization sequence for supplicant AIDL VTS tests."