Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18285591



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