Merge "Added a VTS test to validate the schema of uuid config xml" am: f2d6b0a31d am: b89c0446b2 am: 16c799813e

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

Change-Id: I75036e3dc635c23e4fc55283d3a9bb291167ea1e