Merge "Make PendingIntent immutable and correct Settings package name" am: 51e93653f6

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

Change-Id: I39f50eb0b88d0f255bea1bd46cf61da010491f20