[automerger skipped] [DO NOT MERGE] Fixing unsafe pending intent in notification am: 7ff5163b2d -s ours am: c3ccdd5af9 -s ours am: 9b98f15fde -s ours am: adfd9cea34 -s ours am: d6d0192bcc -s ours am: 0b8cca4fbf -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic27810b63f14125640bbb32df65fdb27aebb0b7b