Merge "Remove shell commands for setting default SMS app"
am: b1b98eaa99

Change-Id: Ic834377d28046c1d38587e50ff0feac98539bfdb