Merge "Fix incorrect package in PackageChangeReceiver" am: 0ee8641209 am: 03c08d1f14

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

Change-Id: I8b990f0929f557cb9b38ebb401ad98e287d39f1b