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

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

Change-Id: Ia63dbe1fd351af59fdd4bad9d50f33a0a877cdfa