Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca978

import android.view.View;

import android.view.View.OnKeyListener;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;

import androidx.preference.EditTextPreference;

        for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {

            getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);

        }

    }

        fillUI(icicle == null);

    @Override

    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {

        super.onViewStateRestored(savedInstanceState);

        fillUI(savedInstanceState == null);

    }

    @VisibleForTesting