Merge "Add TRIGGER_SHELL_PROFCOLLECT_UPLOAD permission" am: 6f1a606d73 am: 4d1b6559ba

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

Change-Id: I043f5408052d90b9dbc7b5bb1b5929f632ebdec0