Merge "Remove vts10 related configs" am: 8dcc0164cc am: 6f8154c766

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

Change-Id: I1e21b7275f6e025f8eb01f507a56f809e2ac8030