tree e9924b64a83621683f9ae9bef6a67193a16edc15
parent cf2d6a8b9daaaf0f337a4422520003971ff1acf0
parent 41fd8b680b2cf9e8381b884863694d64ad207ede
author Xin Li <delphij@google.com> 1693271494 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693271494 +0000

[automerger skipped] Merge Android U (ab/10368041) am: 82e90b4e78 -s ours am: 5cbc159eff -s ours am: 41fd8b680b -s ours

am skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history

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

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