Merge "Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev am: cbf19dcd76 am: 4372af3090" into oc-dr1-dev-plus-aosp
am: a4c4ef8bd0

Change-Id: I9ec8195c23347864abf2bbd1a129cace39abbf28