[automerger skipped] Merge "Add ability for CTS to set itself as carrier service package" into main am: 361438bdc1 am: 1b0aae9c0b -s ours am: a97e627f33 -s ours am: 2271a3ef53 -s ours

am skip reason: Merged-In I09f3107b860618d207a016964515eb1440e7beba with SHA-1 6647762847 is already in history

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

Change-Id: I2078f993125f43b340ba2eec390d06632ae5bb89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>