Merge changes If286ae5d,I0c89907e into main am: 1de01e677c am: 3ca376b972

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

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