Merge "Remove timer when connection is cancelled" am: f08abaa8 am: 42cb90cb am: aafbabec

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



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