Merge "Removed redundant glob from SurflaceFlinger_test" into main