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

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

Change-Id: I4692e096dee9b82666f79760701e4e8fb7a40354