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

[automerger skipped] Merge "DO NOT MERGE: Remove unused intent in NiNotification" into qt-dev am: d1e5a489 am: 937fc47c -s ours am: bb590a31 -s ours am: 0b6db89d -s ours am: af212e89 -s ours am: 9766c986 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5201eedf0c441eb8efb47101d4950539272ca5da