Merge "Add 'ss' trace category in app launch test." into pi-dev am: 0b96d863c6
am: 3b5f321008

Change-Id: I6cf9f1abcbe44740b2fb9ab77fcb66fe05399502