Merge "e911 call should go on same SIM as ongoing VoLTE call." into udc-dev