refix same npe, lost because of the qcril merge

Change-Id: I5e11f8cdd14c428e32f77e410383ca732e7da19d
ISms.aidl: Add callingPkg to sendTextWithPriority.

Needed for Voice+ and SecureSMS, due to breakage caused by QCOM merge.
Reintroduce IccSmsInterfaceManagerProxy.java.

Change-Id: Ib45e19b3d33c44d43368726db6f6f1525783f474
Merge branch 'cm-10.2' into martincz