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

Change-Id: Icee2c41d635883c6b9ede6bf6ec3bbfda22cdc1f