Merge "Merge "Move new RetryFilterHelper() to a method" into oreo-cts-dev am: 145ff5af54" am: 0831f1bb5e
am: 7d19e1089b

Change-Id: Iaf898e22189905ddf6415feecfc740c2d0466760