Merge changes Icd33f3cb,I737479d8 into main am: 0dccb6e265

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

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