[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: 7e508f03 -s ours am: 8ca5e731 -s ours am: b50347a6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib4b3ad05f7b316b101d4a7c35a5e347a0eb89f7e