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

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

Change-Id: Id770b217565eeebabf820cb960b1848313567a59