Merge "[MS31] Fix several hidden API usages" am: 6613c924d2 am: c79f503038

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

Change-Id: I8b3dd856ff75333f14234c81147bd173a8623768
tree: fb887b3a5bbf9f2a618d7b6f3264036b61070853
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/