AR/FR: Keyboard challenge takes precedence.
Tested manually by:
(1) Setting up a gmail account.
(2) Setting up a screen pattern.
(3) Going to Settings > System > Reset Options > Factory Wipe
(4) Hit the Erase button.
(5) Enter pattern into the Screenlock prompt.
(6) Notice the Google credential confirmation screen.
Prior to this change we would skip (5) if there was a Google account on
the device.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=andorid.settings.MasterClear
Bug: 72694056
Change-Id: Ie07c678ecbc8361e8e1792f82efdfb1261db49fb
2 files changed