[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 -s ours am: 891dade5 -s ours am: 9a2a43a0 -s ours

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

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

Change-Id: I9949c6f3814fa54bd85424f025c0875c9d97c3f9