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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cc5b5a8d6ae737f75f9c1cf17f7113bed663613