[automerger skipped] Merge "Replace hidden API with public API" am: 7283a692...

[automerger skipped] Merge "Replace hidden API with public API" am: 7283a692 am: 78619286 am: c127bc6c -s ours am: 98994935 -s ours

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

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

Change-Id: If9b280d478247b90f632e389d8987505a0259f5c