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

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



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