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



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