Merge "Remove XmlUtils in jarjar-rules and use Telephony XmlUtils" am: c2d77020f2 am: ab1cf45500 am: 723f0e6836

Change-Id: Ib8ff4e9522a49e2094f5563ab5696b90bf00b043