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