[automerger skipped] Merge "Merge "Merge "Make emergency NFW notification...

[automerger skipped] Merge "Merge "Merge "Make emergency NFW notification silent" into rvc-dev am: d36e74cf am: b3cea51e" into rvc-d1-dev-plus-aosp am: 83ea0128" into rvc-qpr-dev-plus-aosp am: ffea7f4a -s ours

am skip reason: Change-Id I3d5cb845ddace1cb46bf095d68d7a6d3284b4f45 with SHA-1 fa0ebcaf is in history

Change-Id: Idb07ebd80958d58c8cf27b1001da5bab43398ae3