Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450
am: 7dcd7194b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985 Change-Id: Iea413928ffda34a753c3fc6fa71b2bb29ffe7fa8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: