Merge "[Media Device] Add null check to avoid npe for compareTo method" into tm-dev am: 75948e85b8 am: 6213b3aa4c

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

Change-Id: I69757068899d1a4b9e2fe2b59f113dee46005152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java

@@ -332,6 +332,9 @@ public abstract class MediaDevice implements Comparable<MediaDevice> {
      */
     @Override
     public int compareTo(MediaDevice another) {
+        if (another == null) {
+            return -1;
+        }
         // Check Bluetooth device is have same connection state
         if (isConnected() ^ another.isConnected()) {
             if (isConnected()) {