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

Change-Id: I6b4d126b8b0a6a48bb91752dde2edd6af79b98b7