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

[automerger skipped] Merge "Statsd logging: notification controls." into rvc-dev am: 5568049c am: 0d308a08 -s ours am: 0189b0ce -s ours am: 68b25745 -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: Ic8f22d441c7e51cb79dfbb8f115541f1a8f59e79