[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: ea9d6c95 -s ours am: ef0519b3 -s ours am: b34bdb0d -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: I6841d5491f3ba2d5c32fd0637bea5b6da558bf58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>