This is a follow-up for http://ag/3123412
Test: make ROBOTEST_FILTER=LockAfterTimeoutPreferenceControllerTest RunSettingsRoboTests
Test: make ROBOTEST_FILTER=TimeoutPreferenceControllerTest RunSettingsRoboTests
Bug: 63908311
Change-Id: I27631743d52163f3b6d1589b427ba617e74725a9