Merge changes from topic "netutils_split" am: 22e240c1f2 am: b50e378f0a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f38207dc7d99687a7067b692b02c786ccb696de
tree: 689895935b3b66b2dbbc824c3b1e659568575eb4
  1. staticlibs/