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

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

Change-Id: I9bf4911d7222e62cd33e6b4747ab74a17d5307ad