Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
am: 8f6de85b27
Change-Id: Ie097c989f8d2e9baf11825e4267b9503f8946f3a
This commit is contained in: