Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev
am: cbf19dcd76

Change-Id: If78cc6a4c6a0677e872a99aab9a607022b9008ad