tree c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41
parent 6a14b5344eba5d8a7c7c1b137d0fa1bc45a7990c
parent 3e6f48b1db6c4739cfdd100584764a50462c0cf9
author Xin Li <delphij@google.com> 1623998070 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623998070 +0000

[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c21e847348 -s ours am: 3e6f48b1db -s ours

am skip reason: subject contains skip directive

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

Change-Id: I826c5d04ce36686d8e3eed6ef41447e7ad0c1260