Patch for VTS am: 93945c1d25

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

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