[automerger skipped] Merge "Remove SMSDispatcher.sendData() from greylist as it's params changed" am: fe86a00845 am: c911bc365e
am: 910c491792 -s ours
am skip reason: change_id Ib70dd739d8067ca2e37f0dbc6c48a2d625935a4b with SHA1 cd0d609f75 is in history

Change-Id: I16182565661ae5144c1635a617799d0eefaf5dca