Merge "IMS: Support Video calling setting per subscription"
am: cbea6d25fb

Change-Id: If541dd6ba9c14952ae40da55c5188d16a9f346aa