Merge "PTS-bot: fix failure during reset" am: 22690ba3 am: 46d56a02 am:...

Merge "PTS-bot: fix failure during reset" am: 22690ba3 am: 46d56a02 am: 69063ef3 am: 0e8f8b1a am: 774b0534

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



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