Merge "Merge "Make PendingIntent immutable and correct Settings package name"...

Merge "Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fc am: d34fdc53" into rvc-d1-dev-plus-aosp am: 570633d9 am: 9f51ef5e

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

Change-Id: Ib0becad45c1a0474370f613de364be81f0772906