Merge "Fix class initialization issue" into qt-r1-dev

am: 17e4063de9

Change-Id: I7b9b3d42a6ba7b57242e4cc9b7fbe03473d0ed80

packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java

@@ -77,7 +77,7 @@ public class SysuiColorExtractor extends ColorExtractor implements Dumpable,
     protected void extractWallpaperColors() {
         super.extractWallpaperColors();
         // mTonal is final but this method will be invoked by the base class during its ctor.
-        if (mTonal == null) {
+        if (mTonal == null || mNeutralColorsLock == null) {
             return;
         }
         mTonal.applyFallback(mLockColors == null ? mSystemColors : mLockColors, mNeutralColorsLock);