Merge "Follow-up commit of aosp/2329897" am: d0d4fe20c1

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

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