[automerger skipped] Merge "Make PendingIntent immutable and correct Settings package name" am: f1140d1a9c am: 64e73a539e -s ours am: d43b76f446 -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: I50d2cd385165c00e3b21db4b489d4c3a776d16db
tree: 6b4453ff874f13d24ddcd2f7de91f438c5d14e8f
  1. core/
  2. services/
  3. tests/