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

[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca1 am: b9030097 -s ours am: 3fc2f61e -s ours am: 240612ee -s ours

am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 eee629f4 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109

Change-Id: I50f022d349da36cb90e1fa3fc250659511d42d04