Revert "Fix a bootloop problem when /data/system/usagestats/usage-history.xml is empty."

More complete fix coming from AOSP

This reverts commit abf6bb3e0a759d15d068afa59d2493330d4ddc45.

Change-Id: Ia8cf349634ac5ce5071531718bdcc9d51dd183aa