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

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

Change-Id: I77b4ced25f2dbd461f392eefb83889d2aa4ca9a3