Merge "Remove timer when connection is cancelled" into tm-d1-dev am: 2cf622a9

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



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