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

Change-Id: Ie046e5290a3486f01f8cd41c61357b1dc7e418c0