Merge "Moved from system API to public API" am: 0a281dd66e

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

Change-Id: I4e33c54d7f309205e9ade6b361368c7b3bf04759