Merge "Fix BluetoothInstrumentationTests tearDown flakiness." am: 421716c54e

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

Change-Id: I7c337925cd48d645c0705a6fc5d02644499c8d7c