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

Change-Id: Iabaf929753bbb157e0b9796017fae7f5474ed991