Merge "API revisions in SmsManager and TelephonyManager" into rvc-dev