[automerger skipped] Merge "Add TRIGGER_SHELL_PROFCOLLECT_UPLOAD permission"...

[automerger skipped] Merge "Add TRIGGER_SHELL_PROFCOLLECT_UPLOAD permission" into sc-v2-dev am: 7d84fc75 -s ours am: a0e76c07 -s ours

am skip reason: Merged-In I469fe5f9a0559dde8b887591cfe12c72c104f1d4 with SHA-1 9251bc51 is already in history

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

Change-Id: Ie8d47966be65469deea106f67a79a9f503eb45a9