[automerger skipped] Merge Android 14 am: c98268ca12 -s ours am: 49cc7a3413 -s ours

am skip reason: Merged-In Ie395e992c5007623f00ceecbef0f9627bb1bde62 with SHA-1 69b2c6574c is already in history

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

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