Fix for VTS test CleanupConnectionsOnInitialize am: 45a15ed8b9 am: c0fd000566 am: 16b926e728

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

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