Merge changes I44dc66f9,I72ee7af9

* changes:
  Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
  Fix the default sub id returned by SmsManager.