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