tree efc3d4258cbc76e12e20cef52aa73c00ef8c85c2
parent da18ed0e4f907adc3afa1d06a5af030de590fe97
parent c42d47c18eeafa0aeef26455ae785df226ef9d48
author Xin Li <delphij@google.com> 1660697721 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660697721 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 18132dcad5 -s ours am: 6f6a3c4d93 -s ours am: c42d47c18e -s ours

am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749

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