Merge "Injecting networkstack Quirk stats into statsd" am: 1206788018 am: f46020e884

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1316085

Change-Id: I95b42ff98c5ba31e60cdf91804921abfb1eeafe4