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

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

Change-Id: If38b8bfe7cfe510a07293c1aabe6a785dd8e7380