Simplify factoryReset

Bug: 145171640
Test: compile & run
Change-Id: I85000456b282bb19b003db77f3c363f10269cbe5
2 files changed