Merge "Update statsd config to be mainline compatible." into sc-dev am:...

Merge "Update statsd config to be mainline compatible." into sc-dev am: 83fbf506 am: e66799f3 am: 8df90a4b

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

Change-Id: I89bc6d480001c50f2d4ed225438b812e789ad1eb