[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: 40bac559 -s ours am: 5a187f3d -s ours am: e24de91b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I70b4d00b28855e90cb6c30772c55b6303751397b