Merge "Unhide isRttSupported in TelephonyManager" am: 3d834a0e69
am: 9f588cdd1c

Change-Id: I0f13227568f8268bc061fe793f66df02362841c3