Merge "Use XmlUtils from internal.util instead of the telephony copy"
am: 7ed1a8a9c1

Change-Id: I669eadb06d86dbb598d5b2bf8a69fc85db4e2405