Merge changes I392933f8,I5e4da0c3,I2134b15e into main am: f0ad731bb9 am: dc432d502c am: 7eedbb1e9e am: 11ce659cea

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

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