Merge "uninstall apps after finishing tests" am: 2df671b38d
am: 6f82a2ee2b

Change-Id: Ie8ec28d0e33e2fc52adc5566bfba4c08ea374800