[automerge] usb: Fixed the null pointer issue 2p: 975608fa09 2p: 41e7371744

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

Bug: 200323450
Change-Id: I91ec421de822c0c727a6e87f426ed2c303c78d38

services/usb/java/com/android/server/usb/UsbDeviceManager.java

@@ -237,7 +237,12 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
         @Override
         public void onUEvent(UEventObserver.UEvent event) {
             if (DEBUG) Slog.v(TAG, "USB UEVENT: " + event.toString());
-            sEventLogger.log(new UsbDeviceLogger.StringEvent("USB UEVENT: " + event.toString()));
+            if (sEventLogger != null) {
+                sEventLogger.log(new UsbDeviceLogger.StringEvent("USB UEVENT: "
+                        + event.toString()));
+            } else {
+                if (DEBUG) Slog.d(TAG, "sEventLogger == null");
+            }
 
             String state = event.get("USB_STATE");
             String accessory = event.get("ACCESSORY");