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

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

Change-Id: I34e9294e55a09d33e2bd97c3bd99b2dc1a2da5b2