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

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



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