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