Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev

package com.android.settings.password;

import android.app.Activity;

import android.app.AlertDialog;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.DialogInterface;

import androidx.annotation.NonNull;

import androidx.annotation.StringRes;

import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.FragmentManager;

import com.android.settings.R;