Test fix for finalization branch am: 0f4d6896 am: 597f7b8c am: ec96f9d2

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



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