Patch for VTS am: 93945c1d25 am: ef3b519c03 am: 57adc381fc am: 358fe33013

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

Change-Id: I4e0c8aabff7121a964f8432e89474dae8d3f3097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>