[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: 95fbe3a3 -s ours am: b8ec3622 -s ours am: db29bd89 -s ours am: b6d0a204 -s ours am: bf4ae0cb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I81c8c2e264d137690f84476e3f7943e31e2f2e67