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

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

Change-Id: I2f3aea561e4e31d3d0e0bc18f83c53935748dd64