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