Merge "Update statsd config to be mainline compatible." into sc-dev am: 83fbf506 am: 6b1b66aa am: d22d432c

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

Change-Id: If7749d7f44066d49bf1b46a04c827ca72921d6f9