Merge "Ensure hold capability is removed from ImsConference if hold not supported." into nyc-mr1-dev
am: e8b110c4cb

Change-Id: Ib76486814861051f766eabb25709c47badcc4f3c