tree d3715b420504079bf6957120f94afaeac7f59717
parent e4168624f1f7228c9a542bc01d867a524b54f7e8
author Tyler Gunn <tgunn@google.com> 1494365847 -0700
committer Tyler Gunn <tgunn@google.com> 1495664053 -0700

IMS conference merge improvements.

1. When adding a new child call in an ims conference, use new CS method
to add it and set the parent property at the same time.  This helps
prevent jank in the InCall UI when unparented children are added.
2. When the original call get disconnected, setting the reason code to
IMS_MERGED_SUCCESSFULLY so that dialer will have a notion that the call
is being disconnected due to merging; this will allow better filtering.

Test: Manual
Bug: 37581781
Change-Id: I75e560837c258c1fa9c0fae71c73c2e29bceb1a6