Merge "Bluetooth airplane listener: Check for null" am: 2b7a7f8ec9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a364c1c7676fea23feaa9826fb4573c76309108

services/core/java/com/android/server/BluetoothAirplaneModeListener.java

@@ -119,7 +119,9 @@ class BluetoothAirplaneModeListener {
             }
             return;
         }
-        mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        if (mAirplaneHelper != null) {
+            mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
+        }
     }
 
     @VisibleForTesting