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