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

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

Change-Id: I74e6fbfb35da0049f0cf4a8ddd84dbc652f8bd9c