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

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

Change-Id: Id16d7a9839413b0ec2fe4c29bcaeb2f4aef6f777