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

Change-Id: I874c83a71768fb8bbd0614979fc9520521a80a23