[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: f3f93ad4 -s ours am: be78cd71 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I422ebb758194ee963881142110df621bb17a22cf