Merge "res_pjsip_registrar.c: Update remove_existing AOR contact handling."