Merge "Move StopServicesSetup later in VtsHalBluetoothV1.0TargetTest am:...

Merge "Move StopServicesSetup later in VtsHalBluetoothV1.0TargetTest am: 8c32f711 am: 12320fd0 am: cd47557c am: 8ee5eed6 am: a4251dd4 am: d7bde2c0" into udc-d1-dev-plus-aosp am: 6bc06df9

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



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