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

Change-Id: I13af7f2497590a276e255326307ff32bb49d21b6