Merge "Add TRIGGER_SHELL_PROFCOLLECT_UPLOAD permission" am: 6f1a606d73

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

Change-Id: I632c9df217592506dd7cfb25f2c0eaa9773d1577