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

Change-Id: I2cd6e415e940682c4999cca3eaa4ddc7c48e7d01