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

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

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