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

Change-Id: I9ebbbb3d007732d15dfb679275d3078a8b3ce957