Merge "[UCE] Fix NPE in the RcsContactUceCapability" into sc-dev am: fb0faec367

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

Change-Id: I200b10749dd880749be3112553e01a0d59ecef4d

telephony/java/android/telephony/ims/RcsContactUceCapability.java

@@ -331,7 +331,7 @@ public final class RcsContactUceCapability implements Parcelable {
             return null;
         }
         for (RcsContactPresenceTuple tuple : mPresenceTuples) {
-            if (tuple.getServiceId().equals(serviceId)) {
+            if (tuple.getServiceId() != null && tuple.getServiceId().equals(serviceId)) {
                 return tuple;
             }
         }