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

[automerger skipped] Merge "Statsd logging: notification controls." into rvc-dev am: 5568049c am: 90be90c5 am: 83e688f8 am: 6538964e -s ours

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

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

Change-Id: If92c7a66f252ae9936363fc286c4d8867242b633