Merge "[Mainline] Core Platform APIs migration" am: 39338deffe am: 73eb38e119 am: 08c47277a3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c34c147b6a60c7e6ae09b60d0378b6500ec7218