Merge "Remove shell commands to set default SMS app" am: e82e447861
am: 83daf0fbea

Change-Id: I25e5e7231cda06374e815c1e96e17524cc14cd60