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

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

Change-Id: Ib76dd15bbb74e05f25e56667399b40a8eb914e1c