Merge "Merge "Statsd logging: notification controls." into rvc-dev am: 5568049c am: 90be90c5 am: d1821125" into rvc-qpr-dev-plus-aosp