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

Change-Id: Id2e77481c4febe78c5fd5fc6239878046819351e