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

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

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