[automerger skipped] Merge "Merge "Statsd logging: notification controls."...

[automerger skipped] Merge "Merge "Statsd logging: notification controls." into rvc-dev am: 5568049c am: 90be90c5 am: d1821125" into rvc-qpr-dev-plus-aosp am: 31f00254 -s ours

am skip reason: Change-Id I0e77519d7612634faab7666f3b14614b1bbfcb41 with SHA-1 4567a4c6 is in history

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

Change-Id: Idcd8d7b1a1897632df20d1c7c18e3218221da97b