tree c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41
parent 36d8fba511f97b203fa7cb052fe7dd7be9ce6f48
parent c8f602d4d01a0ed1e80aa58ea89602ef2e684e4a
author Xin Li <delphij@google.com> 1623977836 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623977836 +0000

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s ours am: c8f602d4d0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I42140b7f4355e2d29f751ed0a454fe54254635b7