Merge "Replace hidden API with public API" am: 7283a692b0

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

Change-Id: I4eaeb64157a95e91ca7af93c08a603483ceb9334