Merge "Migrate FlickerPiPTests to WmShellFlickerTests."