Merge "Finalize U carrier id version" into main am: 2fe68961f0

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

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