[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: 29bc9b72 -s ours

am skip reason: Change-Id I5958a8fb442cf4506e1824243493f91aea34a7cc with SHA-1 dd9b2c42 is in history

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

Change-Id: Ifd610d62fd37592f645399da1a4afb2cbeafc037