Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev am: b8437f1c68

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271445

Change-Id: I1739c80b479db6be75041e94716babf66d7609d6