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

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

Change-Id: Ifcfe72ac6c82f30bee36c886cae1e696a84ea67f