Merge "IMS-VT: Add config to control holding a video call" am: fc72e79558 am: 0336989eb8

Change-Id: Icd4ccb99623f3a7d56e682bb1686e963d0765aae