Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fcfe

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

Change-Id: I0ce82679bf81e3c58fed12943b7c9ca9d449fb7f