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

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

Change-Id: I68be9f186018ddadf31e50d54c85085144fd1aee