Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev