Merge "Move carrier in-service check to after E911 timeout." into main