Merge "1/ Migrate cts SplitScreenTests to wm shell flicker test"