Merge "Un-hide TelephonyManager.getSignalStrength()" am: 3e884ce13c
am: 447b7c49fc

Change-Id: I5c1738fca4a43b0e8c1ddd0041a00f96d32142e8