Merge changes from topic "re-enable-bt-instrumentation-tests" into tm-dev am: 27c96eb1

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



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