[automerger skipped] Merge "Add packages based upon carrier config rule" into sc-v2-dev am: d7b5bdc884 -s ours am: 973b310adc -s ours

am skip reason: Merged-In Ib1771296353c4d99cfbe651d3d17405b8278e063 with SHA-1 6c442bf829 is already in history

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

Change-Id: Iab1a2ffd79567dd9c12ec2b069172621da6e2a12