Merge "Statsd logging: notification controls." into rvc-dev am: 5568049c33

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

Change-Id: I242bcc385c41f71c2a8c455a0c31f11a3f66f968