Merge branch 'qcril' into cm-10.2 for Fw/base {WORKING}

Change-Id: I3c4061a1f6b563c79001659b5b8d4727969a2b29
NetworkController: Hide signal strength icon when no SIM icon is shown

Change-Id: I5c4b43bba1469e14474d20a3627eafa597459e6e
TD_SCDMA signal strength support

Change-Id: I0a86eba7c51834054400233044610fa08e7f7fcd
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
ISms.aidl: Add callingPkg to sendTextWithPriority.

Needed for Voice+ and SecureSMS, due to breakage caused by QCOM merge

Change-Id: I1871bc9e3f644b7b82f7da18f404921c237ec55c
NetworkController: Fix hiding signal strength icon when no SIM icon shown

* This now handles the case where the no SIM icon is overlaid with the
* signal strength icon when WiFi is disabled or not connected.

Change-Id: Ie5bf3d9f5cb4752ff631c8fcf7b1a5628219b31b
Revert "Frameworks/base: move custom string in cm_strings.xml file"

CAF stays in strings.xml

This reverts commit e03e106487c630458815cc9c5a523842b3159ba3.

Change-Id: Idd6fbaf76a3a00b9790e876da8ce9b7555901cb6
Remote display framework support.

Any app can use the remote display APIs to mirror to another device...
This can be used to implement AirPlay, Chromecast, or even screen recording.

Change-Id: I3e26d8c324e925940c0febf5f3b912383445fba3
Fix checkapi

Change-Id: I231b2dbdb0ab2c59bf8f0ba96e9f0da1303b8c7e

Change-Id: Ib595b81a11e19f8526e532400e57f5771db09499