Merge "Make framework-statsd stubs use the new defaults" into rvc-dev am:...
Merge "Make framework-statsd stubs use the new defaults" into rvc-dev am: 6efada1a am: 99fe4167 am: 1b52ca8d am: 7f8e89c0
Change-Id: Idfaa79453c9db7c49542022e05963ff59ea8c2c0