Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
am: 8f39c1380c
am: 58b434ad02
am: 90dbc28e57
am: 5756db17a5
Change-Id: Ia39fa168a383ca0c8492b9eda50f436c86cb17d6
This commit is contained in: