Fix for VTS test CleanupConnectionsOnInitialize am: 45a15ed8b9 am: c0fd000566 am: 16b926e728 am: e760f283cc am: 006acfa520 am: fcbef79f03 am: 2ca3e29e63 am: 16403cdedf

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

Change-Id: I80c5e43adb9ad4b80e2ae58e81ae98754fd1d09a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>