Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev