tree 63b3b7122fb85a8fa7293ac35ece4011a8489dff
parent ac1fc5c9b7b2252c94a47b2ade9eb0fa97c75578
author Carlos Valdivia <carlosvaldivia@google.com> 1517279433 -0800
committer Carlos Valdivia <carlosvaldivia@google.com> 1517366385 -0800

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