Merge "Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev am: 3cb64c2c51" into oc-mr1-dev-plus-aosp