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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39c1e02e05b3654c8bb704ce17c1e75ed6277b3d