Merge "Move new RetryFilterHelper() to a method" into oreo-cts-dev am: 145ff5af54 am: 1e7d12b5c2 am: 941526fbc3  -s ours am: f3b2b3201e  -s ours
am: 6396b166c2  -s ours

Change-Id: I6f90ee97ab14817a67c9799726ce1fafc7eca99f