Merge "Merge "Remove unused intent in NiNotification" into rvc-dev am:...

Merge "Merge "Remove unused intent in NiNotification" into rvc-dev am: e9381495 am: dd86002c am: 4ca9725c" into rvc-qpr-dev-plus-aosp am: d28f566f

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

Change-Id: Ib7dbf6d7f23814686be02465818ae428ba9eb1cd