[automerger skipped] Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59
am: 01f4cbf40a
am: d989f66e30
-s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 29b7f1d5fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18285591
Change-Id: I462d4f1939430794ab2ce67dff03ec77733558e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: