[automerger skipped] Merge "Do not use hidden API XmlUtils." am: beac3f42...
[automerger skipped] Merge "Do not use hidden API XmlUtils." am: beac3f42 am: 94933042 am: fca94ac4 -s ours
am skip reason: Change-Id Ie87a9b19bd995245d864693c82a6bd24cc707f09 with SHA-1 abe994e6 is in history
Change-Id: I36aeadc1bbf9d9b721faef3f10feafbbf9729719