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

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

Change-Id: I010f7cfd8928b9f5edb11c74d8a102e21c91bdff