Merge "Refactor SmsManager not to use ActivityThread hidden API in Mainline"