Merge "Replace @hide APIs" am: c0d2b740f0 am: 6e028538ff

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

Change-Id: Ibf16a66ceda2b8e5eac034ecf493cda99c3cdfaa