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