Merge "Make it possible to hide signal strength via Carrier Config" am: febd180254
am: 516b41e5a5

Change-Id: I8b4c01595374604cd2a076f184e25531e63ed4bf