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