Merge "Statsd logging: notification controls." into rvc-dev am: 5568049c am: 90be90c5 am: d1821125

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

Change-Id: Ia56289e8689650eff03f5a13277fe94fd02ef280