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

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

Change-Id: Ie778e1ca548791e3ab797261c3683a64e6b4362e