[automerger skipped] Merge "Use XmlUtils from internal.util instead of the telephony copy" am: 7ed1a8a9c1 am: f644fd877d am: 51690cc6c7 -s ours
am skip reason: Change-Id I831f5211388c6a7627551c71d966d2b9c50cc131 with SHA-1 9f47c3fe9d is in history

Change-Id: I22f393a60c7f04ee975d997adc7cf2889fdcdd6a