Merge "Added Ble scan APIs to BatteryStatsManager"