Merge changes from topic "sk_hal" into main am: 0da7c097 am: 0b79d5ef

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



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