Merge "Remove bluetooth state change logging from BatteryStats" into udc-dev