Merge "Make PendingIntent immutable and correct Settings package name" am: 8ae6128b05

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

Change-Id: I39f50eb0b88d0f255bea1bd46cf61da010491f20
tree: cbe605e770eae22c62c59fd87facddadabb8f8b8
  1. core/
  2. services/
  3. tests/