tree 697f5462051897455a8ba75ff637c5b4d4c67303
parent 49cc7a341318f5b5e9ddc47733dd9ee2a2de06cd
parent 02f9474e2bb5aaa6be8cc93f6992713a26e6b555
author Xin Li <delphij@google.com> 1696579001 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696579001 +0000

[automerger skipped] Merge "Merge Android 14" into main am: 02f9474e2b -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: I39af242ade64b4363b9bdedde4b79d3e09ac29ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>