Merge "Add carrier config for auto redialing 911"
am: b91316f203

Change-Id: Ie77021a09bb896faaa5fc5686563b0ddbf645d48