Merge "Null check for logicaldisplay" into sc-dev am: fca58882db

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

Change-Id: I8f0d0993eef4ddfb612215c042239a72323af448

services/core/java/com/android/server/display/DisplayManagerService.java

@@ -3285,6 +3285,9 @@ public final class DisplayManagerService extends SystemService {
 
             synchronized (mSyncRoot) {
                 final LogicalDisplay display = mLogicalDisplayMapper.getDisplayLocked(displayId);
+                if (display == null) {
+                    return null;
+                }
                 final DisplayDevice device = display.getPrimaryDisplayDeviceLocked();
                 if (device == null) {
                     return null;