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