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: I2af77afcd83d27a9c832a610250c71166d15fc01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>