Merge "Remove vts10 related configs" am: 52578dda5b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451616

Change-Id: I90fbfd7426ce63fd2a2c59f77d7ae95ee5e620d5