Merge "Update test related to usage time api for foreground usage on BatteryUsageStatsProtoTests" into main