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: a1047201 am: 9f8be003 am: d9d65fbf
Change-Id: Iaf8bd6aa7fc3a12c354a6351fb813c306d3f5d14