Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev

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

@@ -127,8 +127,10 @@ class BluetoothAirplaneModeListener {
             }
             return;
         }
+        if (mAirplaneHelper != null) {
             mAirplaneHelper.onAirplaneModeChanged(mBluetoothManager);
         }
+    }
 
     @VisibleForTesting
     boolean shouldSkipAirplaneModeChange() {