Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d am: 3dc5c139cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052927 Change-Id: If73c56407e00388ec976f8898dae2c57d121591c
This commit is contained in: