[automerger skipped] Merge "Remove timer when connection is cancelled" into...

[automerger skipped] Merge "Remove timer when connection is cancelled" into tm-dev am: b33fa69a -s ours am: bf560cd5 -s ours am: 5e63cda5 -s ours

am skip reason: Merged-In I3b8dccb23259d9b97cd248dc8adf7423f74ad3a1 with SHA-1 ebef184f is already in history

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



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