Merge "reset app preferences" into oreo-cts-dev
am: ffd3cae3f5

Change-Id: I2f5588086a55f763ca4184b8f82b5554efc072e2