[automerger skipped] Merge "Make PendingIntent immutable and correct Settings package name" am: f1140d1a9c am: 64e73a539e -s ours am: d43b76f446 -s ours am: c6d90c27a8 -s ours
am skip reason: Change-Id I02e3277358623400aa03dc8996af3d7c46a8ce76 with SHA-1 f2db66615d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325698
Change-Id: Ie26abafb18eb9ef444d890801861f05fa2e69ea0
This commit is contained in: