Merge "Add carrier config for auto redialing 911" into pi-dev
am: f87f8a4820

Change-Id: Ib3d717b2628a0d8f17c5e7c83b10a0e85e338893