[automerger skipped] Merge "[DO NOT MERGE] AM: Fix invalid hot launch app metrics seen with quickstep" into pi-dev am: bdba80d907
am: ba8d3d6109  -s ours

Change-Id: I0f0c5ea20aac2b3f1bf529679fa63eff81673531