Merge "Add packages based upon carrier config rule" am: 6e9d24c99c

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

Change-Id: I6cba01532dcee2d7bfa06979b1b80ca6223b203f