Merge changes from topic "sk_hal" into main am: 0da7c09716 am: 12abf744c8

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

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