[automerger skipped] Merge "Fix trial run in AppLaunch test" am: 3e83b4cad8 am: fdbf99782e
am: ade4132e1c  -s ours

Change-Id: I0d224f14966d51816ebe800947eae73f6407a807