Merge changes Icd33f3cb,I737479d8 into main am: 0dccb6e265 am: 7f01390b34

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

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