Merge "Fix pending intent issue in SipAccountRegistry." into sc-dev am: 77638c1d0e am: c641eab02f am: c7c387a652 am: f7b0f863cb

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

Change-Id: I7e6fb3609fa29cd7034eddccceaf1da52ed228a6