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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645



Change-Id: I583abc51b4e4160783d8ca14d810418b675892d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>