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

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

Change-Id: Id38630adee60dc1f354a87ec514579cb644f8a16