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 am: 54464ab2

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



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