Merge "Update some in-procss APIs to system APIs" am: a7f149d86d am: f0b1601c66

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c2cb79d321d3e5ae686cb9ba682e600df392be0