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

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

Change-Id: If338e6afa0a5665b95a569f8a6d18dd7fdf740db