Merge "Add diag for inputflinger tests" into main