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

Change-Id: I514d635abcb039efa1cc218fe28ba0ed979b9bf7