[automerger skipped] [DO NOT MERGE] Fixing unsafe pending intent in...

[automerger skipped] [DO NOT MERGE] Fixing unsafe pending intent in notification am: 7ff5163b -s ours am: c3ccdd5a -s ours am: 9b98f15f -s ours am: b902cae8 -s ours am: 9cc87162 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2fc903a0973d7aa671fedb59f24adec8c38c81c0