[automerger skipped] Cherry pick carrier id release 20230825 am: d3eb0886fe -s ours

am skip reason: Merged-In I25241cd7bb7034d8d9c698c7a51cd6b31f018ec2 with SHA-1 862b31ca0c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/24704164

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