[automerger skipped] Merge "Reset launch start times when removing a process" am: 397fdf0ff4
am: adc5c93c17  -s ours

Change-Id: I3b93c87ac3c689b1385e93006aa0ce5eca28c8a2