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