[automerger skipped] Merge "Comment out code to send SMS over BT." am:...
[automerger skipped] Merge "Comment out code to send SMS over BT." am: 227f332b am: 0ed0f1f0 -s ours am: 9f88be00 -s ours am: 16f2fca7 -s ours
am skip reason: Change-Id I3583f5a76ed13627f624fb20ecd3aab8cfceb615 with SHA-1 f51faaeb is in history
Change-Id: I0dd67af396a9d0779be5039e6c950e886ebad3a2