Merge "Minor update canHandleType()" into tm-qpr-dev am: 5c14f88bb4 am: 6208e97154

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

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

telephony/java/android/telephony/data/ApnSetting.java

@@ -1137,10 +1137,7 @@ public class ApnSetting implements Parcelable {
             return false;
         }
         // DEFAULT can handle HIPRI.
-        if (hasApnType(type)) {
-            return true;
-        }
-        return false;
+        return hasApnType(type);
     }
 
     // Check whether the types of two APN same (even only one type of each APN is same).