Merge changes I9fd5e4cb,I59872b1a into main am: 66f0636c0e am: 3dbf2ea7fb

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

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