[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: adfd9cea -s ours am: d6d0192b -s ours am: 0b8cca4f -s ours am: b97c0b97 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idbd61cf4d542265d2fbf8dfac52854c7823bd6a7