Merge "Update kernel to builds 8840540" into android13-gsi