Merge "Only display options to save and cancel edits to the displayed APN if the APN is editable."

    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        super.onCreateOptionsMenu(menu, inflater);

        if (mReadOnlyApn) {

            return;

        }

        // If it's a new APN, then cancel will delete the new entry in onPause

        if (!mNewApn && !mReadOnlyApn) {

        if (!mNewApn) {

            menu.add(0, MENU_DELETE, 0, R.string.menu_delete)

                .setIcon(R.drawable.ic_delete);

        }