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

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

Change-Id: I1933253fb5c3589d486d845ceceec9e5641bca3e