Merge "Un-deprecate SmsManager APIs" into rvc-dev am: 85e31403 am: d895f37e am: 41dc0389 am: 59b99119 Change-Id: I70ceeeab79d9d0f4e0d8ea913f3c5e4760ff3451