Merge "Modify VTS to allow testing shim caching" am: 53bd1cc985 am: d7ad17bd16 am: 4203835cfe am: 5ffff69a5b

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

Change-Id: I3e37b4574201d6b46f0230df2a0dcbac1b2ae17e