Patch for VTS am: 93945c1d25 am: f21272df98

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

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