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

Change-Id: Ice7debdbe8caabb0fa1b530a9318f92c25b483af