Patch for VTS am: 93945c1d25 am: ef3b519c03

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

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