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

This reverts commit 286cba172e026515da98c08c93967a9c679ebba2.

AOSP just pushed 2 days ago a way better fix

Change-Id: Ib69ffad209b9f72857cf584c74cc1f8f74e6937a
Merge branch 'kitkat-remix' of github.com:AOSPAL/android_frameworks_base into kitkat-remix