[automerger skipped] Merge "Modify VTS to allow testing shim caching" into...

[automerger skipped] Merge "Modify VTS to allow testing shim caching" into sc-dev am: 62d04467 am: 57d08eba -s ours am: 7e11d3dc -s ours

am skip reason: Merged-In Ibaba149715cfd5e655ce4916b75a29473170f013 with SHA-1 2980a7c9 is already in history

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

Change-Id: Idf64e75705890da0d9d31ad9a538e49f4e891f9c