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

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

Change-Id: I173f72729fcc7de5ac6c2b5fd6ebda9d76865183