Merge "App transition test apk changes for UIAutomator driven app launch" into nyc-mr1-dev am: 0a1cc8e5 am: 0eabbbba Change-Id: I7774006ae4de77a8cbcdf7fac171f2509fc33d8f