Merge "Fix for no error dialog for the first time error" am: 3f09c7a3d0

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1454575

Change-Id: I87af9ee0d2573598d2edf69339d12b0591f85080