tree 05f07a45f26a981524374fe9b8627e4ff46574fe
parent 705a0a499fd2662aec736efdb6e56126766c62ed
parent 4fe492fa4a9db2c97f66407bab88757747154be0
author Treehugger Robot <treehugger-gerrit@google.com> 1604539338 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604539338 +0000

Merge "Handle P-Associated-Uris which are SIP uris in conference host check." am: 0faea3bf7d am: 3871c68210 am: 4fe492fa4a

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1486555

Change-Id: I3ff45222f8d344f75f65a5bc4b398c5e2e5d1821