Merge "Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of...
Merge "Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev am: 3cb64c2c" into oc-mr1-dev-plus-aosp
am: ffb30680 -s ours
Change-Id: I3fb6eb6123ce416097ffb7933ea0830660a83c9d