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

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

Change-Id: I4d8fc399e9519f3a23345fb6317217e3e7f7e741