Merge changes I6a62eea4,I599435cc into main am: c3b754ac34 am: dad0ed46bb

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

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