Merge "Move trimV4AddrZeros to libs/net" am: 54fcb1500e am: 3bb6f4c4eb am: 7e8e775a74

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1637461

Change-Id: I560b3ff26d13fafa3edba90d00ebe548d92b45b3