am 818b239d: am f984eb42: Merge "Addressing API review issues for SmsManager...
am 818b239d: am f984eb42: Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev
* commit '818b239d':
Addressing API review issues for SmsManager (2/3)