Merge "Unregistering PackageMonitor only when has registered it" am: 132f17ca3e

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

Change-Id: I6fdb78c24cf3c09433a2b183dd74c25fd991ec4f