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

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

Change-Id: I76bddf47863ea2677bef5704a4abdf22b27a9af8