Merge "Merge "ProfcollectForwardingService: Pass usage setting when reporting" into udc-dev am: 57145b11" into udc-dev-plus-aosp am: 8f1d9e97

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



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