Merge "Merge "Fix statsd publicapi stub default usage" into rvc-dev am: 578cac6e am: f719ea77" into rvc-d1-dev-plus-aosp