Merge "Make emergency NFW notification silent" into rvc-dev am: d36e74cf82 am: 070356d5d9

Change-Id: I50d74ff5bd5cc963accd6ee0f332df892db0fad0