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

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

Change-Id: Iaa582876fb5ce2a7a233360d82ffc1a368c7279e