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

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

Change-Id: I13104df5dc3bc79939b3e2008ac1ce8534c3d68d