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

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

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