[automerger skipped] Merge "Remove the usage of hidden API and simplify the...

[automerger skipped] Merge "Remove the usage of hidden API and simplify the design" am: 0b66568d am: 2e776008 am: 9e06c07b -s ours

am skip reason: skip tag Change-Id Ib8f8ea1c95503c946b8229670512af2db8be3165 with SHA-1 e52df5b6 is already in history

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

Change-Id: Idb679ea10bd2552c39af590bff084fc87e56c797