Merge "Added annotations to the API"

  }

  public final class DataProfile implements android.os.Parcelable {

    method public String getApn();

    method @NonNull public String getApn();

    method public int getAuthType();

    method public int getBearerBitmap();

    method public int getMaxConns();

    method public int getMaxConnsTime();

    method public int getMtu();

    method public String getPassword();

    method @Nullable public String getPassword();

    method public int getProfileId();

    method public int getProtocol();

    method public int getRoamingProtocol();

    method public int getSupportedApnTypesBitmap();

    method public int getType();

    method public String getUserName();

    method @Nullable public String getUserName();

    method public int getWaitTime();

    method public boolean isEnabled();

    method public boolean isPersistent();

import static android.telephony.data.ApnSetting.ProtocolType;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.os.Build;

import android.os.Parcel;

    /**

     * @return The APN to establish data connection.

     */

    @NonNull

    public String getApn() { return mApn; }

    /**

    /**

     * @return The username for APN. Can be null.

     */

    @Nullable

    public String getUserName() { return mUserName; }

    /**

     * @return The password for APN. Can be null.

     */

    @Nullable

    public String getPassword() { return mPassword; }

    /**