Merge "Revert "Listen to IMS capability status for RTT"" am: e72da7e982
am: 7952a6aa60

Change-Id: Iec564216b0ccc77d1f0845e514d639df6b697422