[automerger skipped] Merge 24Q4 into AOSP main am: 73e9f02723 -s ours am skip reason: Merged-In I1422d0f5b6e136d65e40c3731f60588defa96b94 with SHA-1 423f3f7007 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/3413937 Change-Id: Ibb8d17345fc704d3418a1d5e56c47aba90c58431 Signed-off-by: Automerger Merge Worker <[email protected]>