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

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

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