Patch for VTS am: 93945c1d25 am: f21272df98 am: 7e0c969669

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

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