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

[automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-qpr1-dev am: 74cc0e4f -s ours am: f46c6938 -s ours

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

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

Change-Id: I9c8d7a735cc39e19e2de23d37c64d7bf7ea4d6e4