[MS28.1] Fix several hidden API dependencies am: 94a24370f7

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

Change-Id: I6a79d5eaa2e9e170a4814c02fdad2848cb2943a2