[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: bba79256 -s ours am: 6a2eee20 -s ours am: 8ba83820 -s ours am: 1788e71e -s ours am: 63897813 -s ours

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

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

Change-Id: If37f530dff4fafb6ffd4fe68c07d988c30270c72