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

Change-Id: Ie12322f3e103fa7fee9eec05b7b4970af6414a82