Merge "[MS31] Fix several hidden API usages" am: 0892c27c57 am: b7048e076e am: f95c93fb6d am: 4261d78075

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

Change-Id: I7d22f261f9924cfa7b7a56480a495e8333d94431