[automerger skipped] Merge "Make PendingIntent immutable and correct Settings...

[automerger skipped] Merge "Make PendingIntent immutable and correct Settings package name" am: 51e93653 am: d4f78774 -s ours am: 78919990 -s ours

am skip reason: Change-Id I02e3277358623400aa03dc8996af3d7c46a8ce76 with SHA-1 9743233a is in history

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

Change-Id: I50d2cd385165c00e3b21db4b489d4c3a776d16db