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

Change-Id: I5a140a7372c64687c3073405ef2c41d38f61dc03