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

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

Change-Id: I4b3e88da3bcfd109a84d938356a3662de32f93ec