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

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

Change-Id: Iaba9b70fd6df725c3a74f8a2ab2df70b6c036407