[automerger skipped] Merge "Remove unused intent in NiNotification" into...

[automerger skipped] Merge "Remove unused intent in NiNotification" into pi-dev am: 095a00f2 -s ours

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

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

Change-Id: I7742bdc50690cb0e1bb69c54d0d56d8fe13155e9