Merge "Remove updateUsageBatteryStats in dump due to ANR" into main