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

Change-Id: Idb0e782ab3836b74b5508780162e6a47324c9653