[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am:...

[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: b218bfbb am: 8e21fbdc -s ours am: b7aeee35 -s ours am: 34e345be -s ours am: 7fc4f8f4 -s ours

am skip reason: Change-Id I62da3419408b7eb71ea5319e8717fbb22c76a94e with SHA-1 c628adc6 is in history

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

Change-Id: I6083ed08509d6e3454bd450f18502c1359cdd51f