Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad

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



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