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

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

Change-Id: Ic298a56bec127ce79d10bb834fa4e36d7c5931fa