[automerger skipped] Merge "[DO NOT MERGE] Fixing unsafe pending intent in notification" into qt-dev am: bfc095df4f am: ec3f123bf9 -s ours am: 9bf0157d5f -s ours am: bb022106ef -s ours am: 2787813708 -s ours am: b31bf6b26c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727764 Change-Id: I8211194c63b1305e1ad58eecf665e682b127be62
This commit is contained in: