Merge "Un-hide TelephonyManager.getSignalStrength()"