[automerger skipped] Merge "Reset app reporting on app launch." am: ccaea274c0 am: 3be71b9df6 am: 7cf4b95c22
am: 3503054191 -s ours
am skip reason: change_id I24f5dc125488c6af3164b6503f236bc3a24e6292 with SHA1 8e437d45df is in history

Change-Id: Ibf657895ad88ecfb17036fdd0b2d95e51f36d6cf