[automerger skipped] Merge "DO NOT MERGE: Reset launch start times when removing a process" into pi-dev am: 1932d101fa
am: 0dc4a13cee  -s ours

Change-Id: I0cf1da79839757a6e815ace3bd48185652d1e707