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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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