Merge "Improve initialization sequence for supplicant AIDL VTS tests." am: 1048b42ea6 am: 352fc9106f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1966398

Change-Id: I985f2fb96ff63c753c21f987f90cc544e013d728