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

Change-Id: I9713fcc0f73f98bf41cd95517f5031f325a92c03