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: b234c0a6 am: b444a61e am: 9b08b4bc

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

Change-Id: I0d295fdaa6227d208b8eebf5e9e5409e80350bd0