Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD" am: 473d29e6b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884169

Change-Id: I8fd5520e27ed54997f607b8145ceda7409e12148