[automerger skipped] [DO NOT MERGE] Fixing unsafe pending intent in notification am: 7ff5163b2d -s ours am: c3ccdd5af9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifb5c327ff3c5432e5188f960253f9d9c02ccfb62