Merge "Close the dialog activity when user click cancel or background" into udc-dev am: e959be60a9

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

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

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

@@ -19,6 +19,7 @@ package com.android.settings.bluetooth;
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -27,6 +28,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
@@ -128,6 +130,12 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {
         return SettingsEnums.DIALOG_LE_AUDIO_BROADCAST;
     }
 
+    @Override
+    public void onCancel(@NonNull DialogInterface dialog) {
+        dismiss();
+        getActivity().finish();
+    }
+
     private void launchFindBroadcastsActivity() {
         Bundle bundle = new Bundle();
         bundle.putString(KEY_DEVICE_ADDRESS, mDeviceAddress);