Merge "Add config test Flicker Service WMShell tests" into udc-qpr-dev