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

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

Change-Id: I68a4a9f660d594e6935cfe686766a73086d086f6