Merge "Instantiate displayInfo nonNull"

    private final Phone mPhone;

    private final NetworkTypeController mNetworkTypeController;

    private final RegistrantList mTelephonyDisplayInfoChangedRegistrants = new RegistrantList();

    private TelephonyDisplayInfo mTelephonyDisplayInfo;

    private @NonNull TelephonyDisplayInfo mTelephonyDisplayInfo;

    public DisplayInfoController(Phone phone) {

        mPhone = phone;

        mLogTag = "DIC-" + mPhone.getPhoneId();

        mTelephonyDisplayInfo = new TelephonyDisplayInfo(

                TelephonyManager.NETWORK_TYPE_UNKNOWN,

                TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE);

        mNetworkTypeController = new NetworkTypeController(phone, this);

        mNetworkTypeController.sendMessage(NetworkTypeController.EVENT_UPDATE);

    }

    /**

     * @return the current TelephonyDisplayInfo

     */

    public TelephonyDisplayInfo getTelephonyDisplayInfo() {

    public @NonNull TelephonyDisplayInfo getTelephonyDisplayInfo() {

        return mTelephonyDisplayInfo;

    }