Merge "Remove XmlUtils in jarjar-rules and use Telephony XmlUtils"