[automerger skipped] Merge "Always send USSD codes over the CS pipe." am: bd7d5693 am: 376796f2
am: 359e7a09 -s ours
am skip reason: change_id I6435c3534f9b7c59b5f7b49ded594bc54898cabf with SHA1 8c7f1d52 is in history
Change-Id: Icbc6e51419eec5a9f3b45ecf39722a989c30b97a