Fix failed tests since presubmit is ignored in ag/15802168

Bug: 198553245
Test: make SettingsRoboTests
Change-Id: I91e715a6bfb64419b457812423996365a9464a93
3 files changed