Merge "Provide foreground-service usage time in UidBatteryConsumer." into main