Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: dc11c24806
am: e42c86703b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645 Change-Id: I0b4e8fa0a9abffeb8dd459386f037380eb0d3d30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: