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

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



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