Merge changes I392933f8,I5e4da0c3,I2134b15e into main am: f0ad731bb9

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

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