Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: e55b0a1f17

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

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

telephony/java/android/telephony/data/DataProfile.java

@@ -232,13 +232,14 @@ public final class DataProfile implements Parcelable {
     }
 
     /**
-     * @return True if the profile is enabled.
+     * @return {@code true} if the profile is enabled. If the profile only has a
+     * {@link TrafficDescriptor}, but no {@link ApnSetting}, then this profile is always enabled.
      */
     public boolean isEnabled() {
         if (mApnSetting != null) {
             return mApnSetting.isEnabled();
         }
-        return false;
+        return true;
     }
 
     /**
@@ -534,7 +535,7 @@ public final class DataProfile implements Parcelable {
         @Type
         private int mType = -1;
 
-        private boolean mEnabled;
+        private boolean mEnabled = true;
 
         @ApnType
         private int mSupportedApnTypesBitmask;