Merge "Merge "Make emergency NFW notification silent" into rvc-dev am: d36e74cf82 am: b3cea51e25" into rvc-d1-dev-plus-aosp