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

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

Change-Id: Ia8fe69df64d98bdb04eaa62b675ed8ab17972e85