Merge "Pause watchdog triggering on the main thread during OtaDexoptService" into qt-dev am: fb9843f8d7

am: 9b05627270

Change-Id: I944649c7bff878ce63e566d2ebdf80ecc484d185

services/java/com/android/server/SystemServer.java

@@ -749,10 +749,12 @@ public final class SystemServer {
             if (!disableOtaDexopt) {
                 traceBeginAndSlog("StartOtaDexOptService");
                 try {
+                    Watchdog.getInstance().pauseWatchingCurrentThread("moveab");
                     OtaDexoptService.main(mSystemContext, mPackageManagerService);
                 } catch (Throwable e) {
                     reportWtf("starting OtaDexOptService", e);
                 } finally {
+                    Watchdog.getInstance().resumeWatchingCurrentThread("moveab");
                     traceEnd();
                 }
             }