Merge changes I93619476,Idc284541 into main am: 1d1198c209

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

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