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

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

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



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