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

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

Change-Id: I8fc36dcc5d7a1769e302735a1a613356329926ff