[automerger skipped] Merge "Statsd logging: notification controls." into rvc-dev am: 5568049c33 am: 0d308a0826 -s ours
am skip reason: Change-Id I0e77519d7612634faab7666f3b14614b1bbfcb41 with SHA-1 4567a4c68a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947592
Change-Id: I07ceaba6223d7c03bc69abf049eadfbacc5758b0
This commit is contained in: