Merge "VintfObject: use toXml." am: e8456d8ded am: c3a768efaf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678425

Change-Id: I4010afc700a61f7221f8d6fac7109ec0ca51e932