Merge "Add 6.1 kernel to current matrix" am: 0691e0e416 am: 3027dbd323 am: ea712e1062

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

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