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

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

Change-Id: I2b658beee957b7424ed3e66c8acb6aa071950715