Merge "Re-enables ChooseLockTypeDialogFragmentTest for robolectric" into main