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

Change-Id: I5c4b43bba1469e14474d20a3627eafa597459e6e
telephony: disable the use of SMS_EXPECT_MORE by default (1/2)

CodeAurora added the use of the RIL_REQUEST_SEND_SMS_EXPECT_MORE API
which is not supported by every RIL. Disabled it by default to reflect
AOSP behavior and added a flag to enable it.

Change-Id: I837c161bbca3960e7458ea049f896218d5e60a63
Merge "NetworkController: Hide signal strength icon when no SIM icon is shown" into cm-10.2
frameworks/base: merge CyanogenMod

Change-Id: Id6cbebfa64c701dcacc17db4b4bf811ebf104ab7