合并上游更改

感谢：@821938089、@zhongerxll、@youke2580c、@Leroy-X、@Dark-Tide、@lhjgege、@3harmony、@mgz0227

app/src/main/java/io/legato/kazusa/base/BaseService.kt

@@ -75,9 +75,9 @@ abstract class BaseService : LifecycleService() {
     }
 
     @CallSuper
-    override fun onTimeout(startId: Int) {
-        super.onTimeout(startId)
-        LogUtils.d(simpleName, "onTimeout startId:$startId")
+    override fun onTimeout(startId: Int, fgsType: Int) {
+        super.onTimeout(startId, fgsType)
+        LogUtils.d(simpleName, "onTimeout startId:$startId fgsType:$fgsType")
         stopSelf()
     }