Persist delayed calls to factory reset...

...so the device is factory reset on reboot if necessary.

NOTE: this is same as 23bcae6f5bd8c08d6315dbaba7b9ab34f1c1bac9, but
without the extra, accidental parser.next() line that broke stuff.

Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Test: atest FactoryResetterTest
Test: manual verification

Bug: 171603586
Bug: 177391800
Change-Id: Ic18ee40b04eaf68c9da278970c9586cca93eef9d
6 files changed