Merge "Fix SettingsXml start tag logic" into sc-dev

services/core/java/com/android/server/pm/SettingsXml.java

@@ -181,7 +181,10 @@ public class SettingsXml {
         }
 
         private void moveToFirstTag() throws IOException, XmlPullParserException {
-            // Move to first tag
+            if (mParser.getEventType() == XmlPullParser.START_TAG) {
+                return;
+            }
+
             int type;
             //noinspection StatementWithEmptyBody
             while ((type = mParser.next()) != XmlPullParser.START_TAG