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

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

Change-Id: I4b6b23d728007e7646b838a5f5b58a300c293639