Merge "Eliminate some unnecessary waiting time of WM CTS" into android12L-gsi