Merge "Fixed service / framework test suites broken after migration" am:...

Merge "Fixed service / framework test suites broken after migration" am: d3b3156c am: 52cd41c9 am: 139177ec

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2192917



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