Merge "Refactor SmsManager not to use ActivityThread hidden API in Mainline" am: 419caebf am: bee019ac Change-Id: I1c07376592a0e63e79ec52e9f7aeede2df46a3f6