Merge "Update BatteryStatsImpl to handle multidisplay" into sc-v2-dev