Merge "Un-deprecate SmsManager APIs" into rvc-dev