[MS28.1] Fix several hidden API dependencies am: 94a24370f7 am: 2f096cacfd am: f49beebf8a am: 3f33d22d92

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

Change-Id: I913a38bb2c7dc3622df4604068d1a55a9992ccf4