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

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

Change-Id: I22721f4c2ec02e395322668f9a3890d756663ef5