am f984eb42: Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev

* commit 'f984eb42724e66326549d7bf33a7ec1515a7ff3c':
  Addressing API review issues for SmsManager (2/3)