[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

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

Change-Id: I4ab914f673768ea7d82dc36a16e057f2431fa91f