Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev

import java.io.FileOutputStream;

import java.io.FileReader;

import java.io.IOException;

import java.nio.charset.StandardCharsets;

import java.util.ArrayList;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.HashMap;

                try {

                    infile = mPolicyFile.openRead();

                    final XmlPullParser parser = Xml.newPullParser();

                    parser.setInput(infile, null);

                    parser.setInput(infile, StandardCharsets.UTF_8.name());

                    XmlUtils.beginDocument(parser, TAG_SMS_POLICY_BODY);

                outfile = mPolicyFile.startWrite();

                XmlSerializer out = new FastXmlSerializer();

                out.setOutput(outfile, "utf-8");

                out.setOutput(outfile, StandardCharsets.UTF_8.name());

                out.startDocument(null, true);