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

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

Change-Id: I4246204b6c80fdcad3b92a3eb2ed491ea23f3f60