Merge "Check for null service in ScreenshotHelper" into rvc-dev am: 1e23e8e274

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

Change-Id: I3615b21cb6818a137d045740f56d7d1e4acf7acc

core/java/com/android/internal/util/ScreenshotHelper.java

@@ -316,7 +316,7 @@ public class ScreenshotHelper {
             };
             msg.replyTo = new Messenger(h);
 
-            if (mScreenshotConnection == null) {
+            if (mScreenshotConnection == null || mScreenshotService == null) {
                 final ComponentName serviceComponent = ComponentName.unflattenFromString(
                         mContext.getResources().getString(
                                 com.android.internal.R.string.config_screenshotServiceComponent));