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



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