[automerger skipped] Merge "ProfcollectForwardingService: Pass usage setting...

[automerger skipped] Merge "ProfcollectForwardingService: Pass usage setting when reporting" am: 962c4454 am: 472d8122 am: e3d4474d -s ours am: 39070d72 -s ours am: 5f74eae1 -s ours

am skip reason: Merged-In I891d10d023766009903383abb6421f3947f5f612 with SHA-1 28f42bba is already in history

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



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