Merge "Prevent developer provided strings from being uploaded through statsd."...

Merge "Prevent developer provided strings from being uploaded through statsd." into rvc-dev am: 7a65a7a3 am: 113387f3 am: 2267948e

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

Change-Id: I889d5c8331a9188d82f81499b7ba7966e092721a