NetworkController: Hide signal strength icon when no SIM icon is shown

Change-Id: Ia830c85b520d141a3517a8b0c414f35e1538ac66
Telephony: Set the value of min match according to one property

Change-Id: I6965fa58cc113620da3fd3148eea8e5ed3986420
Fix merge derp