Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD"