[automerger skipped] Merge "Injecting network ip provision stats into statsd" into rvc-dev am: f61f0a78 am: 00c2dd8e -s ours am: 2451d110 -s ours

am skip reason: Change-Id If4bc6af1b794a8620a08858d6cfd85e661865bd7 with SHA-1 342cb2c7 is in history

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

Change-Id: I132d7fb9227475ccb9d642307d59cba09b778ad9