[Mainline] Core Platform APIs migration am: 869a7270f8 am: 39b53e77c5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f7df2db06dc9b24b6b1c557ca8213b2b6826927
tree: a04f3a80f23957a6a2e1890308da3c3c9f5f5f7d
  1. staticlibs/