[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: 9e54f689 -s ours am: c57f519f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I56f5ae1941f105a36476900021def0cece906dcc