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

Change-Id: I64b6eece29d475d8fdbaf8f6d1fb2c62701fd6e4