Merge "VintfObject: use toXml." am: e8456d8ded

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

Change-Id: I098f5b6d7f4e3f1a8f99c18e89df13ffeec35fed