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

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

Change-Id: I207db80e60ef7e41b3245baafa38638fc573fd3e