Merge changes I53a67135,I235ca85f,If3180282 am: 7c0d76357c am: 0463ca058b am: 277400268f

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

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