Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev

            // Updates value returned by SettingsActivity.onActivityResult().

            SettingsActivity sa = (SettingsActivity)getActivity();

            Intent resultIntentData = sa.getResultIntentData();

            resultIntentData = resultIntentData == null ? new Intent() : resultIntentData;

            resultIntentData.putExtra(EXTRA_REQUIRE_PASSWORD, mPasswordRequired);

            if (resultIntentData == null) {

                resultIntentData = new Intent();

                sa.setResultIntentData(resultIntentData);

            }

            resultIntentData.putExtra(EXTRA_REQUIRE_PASSWORD, mPasswordRequired);

        }

        @Override

        public void onClick(DialogInterface dialog, int which) {