[automerger skipped] Merge "Make PendingIntent immutable and correct Settings package name" am: 8ae6128b05 am: 0b55f2fac7 -s ours

am skip reason: Change-Id I02e3277358623400aa03dc8996af3d7c46a8ce76 with SHA-1 70aed281f1 is in history

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

Change-Id: Ib4f8628ead3b0a39a0d1009cb2fd4c0ef5ea246a
tree: 6b4453ff874f13d24ddcd2f7de91f438c5d14e8f
  1. core/
  2. services/
  3. tests/