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

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

Change-Id: If209dd6c337b7478c11690c8df210bf668b7a8eb