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

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

Change-Id: I8b3dd856ff75333f14234c81147bd173a8623768