Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev