Merge "Merge "Migrate statsd_test to use libstatslog_statsdtest" into rvc-dev am: 4980c0a6 am: a846cf46" into rvc-d1-dev-plus-aosp