Merge "Remove vts10 suite setting" am: 9df87e51af am: a52e54eba7

Original change: https://android-review.googlesource.com/c/platform/cts/+/1451856

Change-Id: I0420c3993c8a7c96ddf58af373a2e6a69a9539f8