Merge "Set static Dependency ref after all the Deps are set up." into pi-dev

am: 666be7b688

Change-Id: I14160dc6b18a1874808819be088d0ed9506c49ba

packages/SystemUI/src/com/android/systemui/Dependency.java

@@ -151,7 +151,6 @@ public class Dependency extends SystemUI {
 
     @Override
     public void start() {
-        sDependency = this;
         // TODO: Think about ways to push these creation rules out of Dependency to cut down
         // on imports.
         mProviders.put(TIME_TICK_HANDLER, () -> {
@@ -331,6 +330,8 @@ public class Dependency extends SystemUI {
 
         // Put all dependencies above here so the factory can override them if it wants.
         SystemUIFactory.getInstance().injectDependencies(mProviders, mContext);
+
+        sDependency = this;
     }
 
     @Override