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 am: d01a5ca39f
Change-Id: Ia39abe58839e20f70e22064a5aa43362ab1ecd9b
This commit is contained in: