Merge "Clean up SmsApplication and expose getDefaultSmsPackage" am: 2ada7fbac2 am: b128b793c7 am: cccf7a2b84

Change-Id: Id3b15d9d4d58235034405c85b7e10fc42f3e4172