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: Ia44b4360a74f161e3c383765e0b76b08d97ade68
tree: e4af470027fd6ad9a25b35c100628e084baa2e25
  1. staticlibs/