Fix bootloop issue with UsageStatsService. am: 669d886cdc am: ee3d800165 am: 876b7721e8
am: 86e253c314

Change-Id: I899d10d1d6cf0797cd72456972a8d8d5e41decb6