Merge "[MS19.1] Fix several hidden API dependencies" am: 613e503207

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

Change-Id: I08a0606e4f7bbc3aeca9679ec9072653d8f2ee9b