Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887

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

Change-Id: I472fd717d82304e4362c3075805b460b02a197e0