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

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

Change-Id: Ie5de66a32e99a8c8d3645c5c10fe3cac03ed4b9a