Fix order of '+' in call forwarding return result in RTL locales

The '+' is presented at the end of the phone number
instead of in the front.
Phone numbers should be presented left-to-right even
for right-to-left oriented languages (e.g. Hebrew),
hence the '+' should be placed accordingly.

Change-Id: I07d89078de4d81609e08099f93fc929a81ec172b
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_opt_telephony into cm-11.0
Don't write blank baseband version

* There's no point in setting the baseband version if the returned value
  is blank anyway.

Change-Id: Ica9973a8b790c0de6afa10bc131257a3a03f18a0
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_opt_telephony into cm-11.0
Merge branch 'cm-11.0' of https://github.com/temasek/android_frameworks_opt_telephony into HEAD