Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 4f0e7df6e3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61c84ce1b8e1a9ccdb8fd1581bf0c3906db943f3