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