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

Change-Id: I51f21417003107d4db673b190d6c5aa6f611159d