Merge "Un-deprecate SmsManager APIs" into rvc-dev am: 85e31403 am: d895f37e am: 8af53a13 am: 1b85e731 Change-Id: Icf5ce6121cc3f354080e4f582bc7caf1ed75e465