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