Merge "Change g.*Converter to fromXml." am: 9c359a24b0

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1677314

Change-Id: I85e997543e65ae8658b2b3d203cfce16d4d750df