Fix after aosp/2836447 am: d664a63cf4 am: 4b200f5e55 am: b153b6e4c2

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

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