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