Merge "[BatteryStats] Correct formatter for pkginst in battery stats." am: 2c250e322b am: b6aa42807c
am: a3e91325a6

Change-Id: I16884ec77b77c0a24665b7e58374670e850ebd6d