[automerger skipped] Merge "[DO NOT MERGE] AM: Use ActivityMetricsLogger to get app launch times" into pi-dev am: a6fc25f6d3
am: 6ec0815612  -s ours

Change-Id: Ia672a3af2fa9e1413d1a7a33abab6d0324079064