Merge "Allow broadcast receivers to receive DATA_SMS_RECEIVED_ACTION." into oc-dev
TreeHugger Robot [Fri, 9 Jun 2017 07:17:26 +0000 (07:17 +0000)]

Trivial merge