Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7

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

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

src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java

@@ -82,6 +82,12 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
         return mDialog;
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mPairingController.onCancel();
+    }
+
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
     }