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

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

Change-Id: Ia9f8837d25bcf1f5e758bbe9c329796803bc4dfa