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

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

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