Merge "Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fc am: d34fdc53 am: c15659d0" into rvc-qpr-dev-plus-aosp am: d881d890

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

Change-Id: I8882807cf5d78f48b65042c4ae70d5ea7df1b912