Merge "Fix trial run in AppLaunch test"
am: 3e83b4cad8

Change-Id: Ia7d8b3d41614dc09c68e4fdae05934c5f1f9e4c7