Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 4f0e7df6e3 am: 3bd9d6993b am: c065b05794

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc75ae78a6a09fac22cd2ae9ddc04138c4ba02d3