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

Change-Id: I53c8883ef14106d5bda42f1361af3e7153dd9ad1