Merge changes from topic "sms_trampoline_intent-qt-dev" into qt-dev

* changes:
  Trampoline SMS disambig dialog to Telephony
  No longer show disambig when calling SmsManager#getSubId