Merge changes I53a67135,I235ca85f,If3180282 am: 7c0d76357c

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

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