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

[automerger skipped] Merge "Remove unused intent in NiNotification" into oc-mr1-dev am: 03ea7aa9 -s ours am: b321e8fa -s ours am: ae5926a8 -s ours am: d9a34107 -s ours am: dcca60b5 -s ours am: d6734e76 -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/+/12173662

Change-Id: Ia025b324c58311caec8b77ce2b30cb62a38ea86e