Merge "Add 6.1 kernel to current matrix" am: 0691e0e4 am: 3027dbd3 am:...

Merge "Add 6.1 kernel to current matrix" am: 0691e0e4 am: 3027dbd3 am: ea712e10 am: fbefc762 am: dd060b7a

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



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