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

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

Change-Id: Idcc5f50b3d92f8742caa96fcffffef95dd6b68e0