Merge "Fix NPE in SmsManager and keep existing behavior" am: 8b95375a4a
am: 43663aa497

Change-Id: Ic06416fc68dd8ed12d09978cd96c5cfe7b376225