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

[automerger skipped] Merge "Remove timer when connection is cancelled" into tm-d1-dev am: 2cf622a9 -s ours am: 50a4d3ae -s ours am: f5c39530 -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/+/19381754



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