Merge "Hide signal strength when told by carrier" am: 9afa720abe
am: ed9508f3a6

Change-Id: I43c22e7f6950adcf27a5b600a194927cbd06fb9b