am 7b671aff: am 5bb4fbef: Merge "Addressing API review issues for SmsManager...
am 7b671aff: am 5bb4fbef: Merge "Addressing API review issues for SmsManager (1/3)" into lmp-mr1-dev
* commit '7b671aff':
Addressing API review issues for SmsManager (1/3)