[automerger skipped] Merge "Profcollect: Allow manually triggering profile...

[automerger skipped] Merge "Profcollect: Allow manually triggering profile upload" into udc-dev am: 5678f63c am: f28147ed -s ours am: 61fb8f07 -s ours

am skip reason: Merged-In Icceec481553cc42f674583c8eeae5874f53d18d3 with SHA-1 6c0c4858 is already in history

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



Change-Id: I5a97f676220145fce3cef88f5f53103490024941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>