Merge "Remove references to hidden APIs from public Javadoc" into sc-dev am:...

Merge "Remove references to hidden APIs from public Javadoc" into sc-dev am: a049b385 am: 799ce749

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I877602352d8e0144e8aff02bec1e7c0bc9a9d61a