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

[automerger skipped] Merge "[DO NOT MERGE] Fixing unsafe pending intent in notification" into qt-dev am: bfc095df am: ec3f123b -s ours am: 9bf0157d -s ours am: bb022106 -s ours am: 27878137 -s ours am: b31bf6b2 -s ours am: 7690b6e0 -s ours am: dc76e6aa -s ours

am skip reason: subject contains skip directive

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

Change-Id: If5618853b02b410e7c9d6654daa45bb497eb0a9d