[automerger skipped] Remove timer when connection is cancelled am: 97412bc3...

[automerger skipped] Remove timer when connection is cancelled am: 97412bc3 -s ours am: b6d01b58 -s ours am: c1153fcf -s ours

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

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



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