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: 7f757a30 am: 1ed2d1e3

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

Change-Id: Ib06abfe9399b0c69ab26c137b77f395033c55219