Merge "Register and update input settings after boot" into udc-dev am: 783c600593 am: 4859006bc1 am: d1e144ea14

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23373898

Change-Id: I4dbc9699e975bc61664c723472931270e214fc61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/input/InputManagerService.java

@@ -493,8 +493,6 @@ public class InputManagerService extends IInputManager.Stub
 
         // Add ourselves to the Watchdog monitors.
         Watchdog.getInstance().addMonitor(this);
-
-        mSettingsObserver.registerAndUpdate();
     }
 
     // TODO(BT) Pass in parameter for bluetooth system
@@ -505,6 +503,8 @@ public class InputManagerService extends IInputManager.Stub
 
         mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);
 
+        mSettingsObserver.registerAndUpdate();
+
         synchronized (mLidSwitchLock) {
             mSystemReady = true;