Merge "Fix system watchdog timeout when reading too many usage events." am: 10b0bae06f am: b3d48f18a9

am: f12ffe6d76

* commit 'f12ffe6d762f281cbda56322be83a1da80b707ea':
  Fix system watchdog timeout when reading too many usage events.

services/usage/java/com/android/server/usage/UsageStatsService.java

@@ -218,7 +218,7 @@ public class UsageStatsService extends SystemService implements
             synchronized (this) {
                 mScreenOnTime = readScreenOnTimeLocked();
             }
-            mDisplayManager.registerDisplayListener(mDisplayListener, null);
+            mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);
             synchronized (this) {
                 updateDisplayLocked();
             }