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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff5de7e8257671c42acbe3f2737f19df38af7e13