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

[automerger skipped] Merge "Remove unused intent in NFW notification" into qt-qpr1-dev am: f812e6e3 -s ours am: b61579b9 am: 752bfca7 -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/+/11829301

Change-Id: Iaf855f7b0ef7efab4a9a4b9bb23d94dc014b6f22