[automerger skipped] Merge "Remove unused intent in NFW notification" into...

[automerger skipped] Merge "Remove unused intent in NFW notification" into qt-dev am: d28d2e48 -s ours

am skip reason: Change-Id I81fe2b1df96b73a43123851ab98575feacf3331a with SHA-1 6967df74 is in history

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

Change-Id: I7538aed534bda3aa449ed0c3a153b1b347accce2