[automerger skipped] Merge "Injecting network ip provision stats into statsd" into rvc-dev am: f61f0a78 am: 00c2dd8e am: 2658087f -s ours am: 9d1a869e -s ours

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

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

Change-Id: If1b474a91e53cd484504a7d2569e2fe92879380f