Merge "Remove vts10 related configs" am: 32cbcb7cfe am: 1daf055804

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1449295

Change-Id: If69ae216516c2ab25fece25a18c832cf05f1fd1a