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

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

Change-Id: I50b5079096de46fcf8cdbabaf34e7b31817df6db