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

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

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