Merge "Fix NPE when passing displayId through handler" into sc-v2-dev am: d9dede17af

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

Change-Id: Ia1a9b6c6ab384f44c7c1e94541a49582452b801b

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

@@ -2252,6 +2252,9 @@ public final class DisplayManagerService extends SystemService {
                         int displayId = msg.arg1;
                         final LogicalDisplay display =
                                 mLogicalDisplayMapper.getDisplayLocked(displayId);
+                        if (display == null) {
+                            break;
+                        }
                         uids = display.getPendingFrameRateOverrideUids();
                         display.clearPendingFrameRateOverrideUids();
                     }