tree 2b393083d369c0e3d37eca44e936e802c5306b12
parent afad476dc56a815cdc4a4a7cd53ef3afcfdfdc6e
parent bdfd9b4a76260ee66cd5ea7618bfd53fb9a2fc67
author Xin Li <delphij@google.com> 1629246259 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629246259 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a1de4c6517 -s ours am: 883e10b6eb -s ours am: df427d2297 -s ours am: bdfd9b4a76 -s ours

am skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history

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

Change-Id: I4363495fd3ad12b5d071a183c347a394608e34d8