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

Change-Id: I849a53913f57687e07951263e1db946a4824f5e9