[automerger skipped] Merge "DO NOT MERGE: Remove unused intent in...

[automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-dev am: d1e5a489 am: 937fc47c -s ours am: bb590a31 -s ours am: f74f12f3 -s ours am: b2d94a45 -s ours am: 57172859 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I268d7b521dc39c73ff70bf996aa57aab6929862b