[automerger skipped] [DO NOT MERGE] Fixing unsafe pending intent in notification am: 7ff5163b2d -s ours am: c3ccdd5af9 -s ours am: 9b98f15fde -s ours am: b902cae8db -s ours am: 9cc8716260 -s ours am: 9e54f689f7 -s ours am: c57f519fd6 -s ours am: 9bab335b15 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I992c3df9685332fb00d39fd6cffdf31ab568deda