[automerger skipped] Merge "Do not use hidden API XmlUtils." am: 2626cc7089 am: 6f083ff661 am: 1d4e3c0313 -s ours
am skip reason: Change-Id Ibcf7b23a8b6628aa482b34f867db57e4cb0dbb8e with SHA-1 ae3d807965 is in history

Change-Id: I8a7de78613691f6e27049f7bd09fb17d82216ef8