Merge "Include the CWT validation in VTS testing." am: 608099fd88 am: 769c2bf958 am: b90df9e683 am: 8b4d894f2e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1965500

Change-Id: I4c47b6217b5fa957df87ed7eb766398821521f7f