commit 9eaef23d17fda6f1cd25c80df93a58e4baa4bcfa
author Tyler Gunn <tgunn@google.com> Mon Jun 27 13:12:43 2016 -0700
committer Tyler Gunn <tgunn@google.com> Mon Jun 27 13:12:43 2016 -0700
tree b52ce574eeb8b61dcb5fa4378b91757c54ce7c29
parent ec6f78f6d85d75acfc0c8696a96b5a694d984844

A few conference calling fixes:

1. b/28325313 - When an SRVCC occurs, ensure that a phone account handle is set on
the GsmConnection which is added to Telecom.  Also ensure that the
PROPERTY_CONFERENCE bit is set on the connection to ensure that the
InCall UI can display the correct label.
2. b/29059073 - Handle case where a video call is downgraded to an audio
only call, and thus should be able to be merged into a conference.

Bug: 29059073
Bug: 28325313
Change-Id: I56d3f89e4f07d8ad5edc5793fe6094e5887ff786