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

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

Change-Id: Ie5aee6aadad7a50237a3f411187e3b9979b03c3b