[conflict] Merge "Fixed service / framework test suites broken after...

[conflict] Merge "Fixed service / framework test suites broken after migration" into tm-qpr-dev am: 852a9107 am: 9ddc9d86

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



Test: atest GoogleFrameworkBluetoothTests
Test: atest GoogleServiceBluetoothTests
Change-Id: I2a19f9c44328d14787f3130f1e22bfcff49f2f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>