[automerger skipped] Merge "Remove shell commands to set default SMS app" am: e82e447861 am: 83daf0fbea
am: 45f0b7d724 -s ours
am skip reason: change_id I30d806e38a34af7167ad44ea31f4fb9592c89516 with SHA1 dfe0efa504 is in history

Change-Id: I68abd9f7528c7ed16aad5eb1acaacc91834c9772