Merge "Finalize S carrier id version and Bump latest SDK version" am: 72b37d3c6c

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

Change-Id: I6538a2e29077f29fd92dd9c1800dac9a0ae407cf