Merge change I83fd7b0d

* changes:
  frameworks/base: Handle broadcast sms properly