Merge "Fix three flaky tests." am: 40b9c3a2 am: b9201ebc am: 318ecd4d am: 167f0655

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



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