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

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

Change-Id: Id1d502a39844625461c09ddab97d150f86a7251d