Merge "Injecting networkstack Quirk stats into statsd" am: 12067880 am: f46020e8 am: b47e6e04 am: 518618bd

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

Change-Id: Ied68aa717996bbe6b2e3ea7559326d91d390d4fb