Merge "Remove SMSDispatcher.sendData() from greylist as it's params changed" am: fe86a00845
am: c911bc365e

Change-Id: Ia8a438259b450a1302f6d57e398dc9c99d69e1d8