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

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

Change-Id: I0ec9e26c1aa938755537a6438e5345177f31af4a