[automerge] Fixed lingering network bitmask not set issue 2p: c29f0720f0

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

Change-Id: Ieedc9c7de1ab1ce537b519b1d51ed3344a7c0447

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

@@ -1576,7 +1576,9 @@ public class ApnSetting implements Parcelable {
      * @hide
      */
     public boolean canSupportLingeringNetworkType(@NetworkType int networkType) {
-        if (networkType == 0) {
+        // For backwards compatibility, if this field is not set, we just use the existing
+        // network type bitmask.
+        if (mLingeringNetworkTypeBitmask == 0) {
             return canSupportNetworkType(networkType);
         }
         // Do a special checking for GSM. In reality, GSM is a voice only network type and can never