Bug: 38415015 Test: BugreportParserTest, DumpsysPackageStatsParserTest, DumpsysParserTest Change-Id: Id6e5ccbd39188be0b6908df751b310cd0f642593 (cherry picked from commit 44e6c57b)