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

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

Change-Id: Ib3596c8941803cfc7e55d47e2099d38857ade59c