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

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

Change-Id: I6905839ac485333f0bf6970d7c8438d91c6d2774