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

[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e278 am: 09a8b68f -s ours am: 073a58d0 -s ours am: 29cd04ed -s ours am: f6fbae6b -s ours

am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae6761 is in history

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

Change-Id: Ib4dbd5d52c01ef0dfe82dc7856ab2ee252b42b58