[automerger skipped] Merge "Replace hidden API with public API" am: 7283a692b0 am: 78619286d3 am: c127bc6c68 -s ours

am skip reason: Merged-In I671aaf5099f7cd3459588a78cb99de39a0e23f95 with SHA-1 d569b783aa is already in history

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

Change-Id: Iabc9b8598bdeb8b0b23e9f4c39c2c421a62fe434