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

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

Change-Id: I74751c1ca1b406d3d489797394ffa7039f384cf0