Merge "Modify VTS to allow testing shim caching" am: 53bd1cc985

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

Change-Id: Ie48eb8fed815b8eaa708ee66a1b9d690edfb78a3