Fix after aosp/2836447 am: d664a63cf4 am: 4b152c3bf9 am: a59f7b2213

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

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