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

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

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