Merge "Fix for no error dialog for the first time error" am: 3f09c7a3d0 am: fa372bdc72 am: 0812ab933c am: 866dabcc48

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

Change-Id: I266d839a97197d07cccb13aa731ed96824537631