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