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

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

Change-Id: Iabff8aeacfc469026564875af892658352d7665d