Merge "Refactor SmsManager not to use ActivityThread hidden API in Mainline"
am: 419caebfc9

Change-Id: I194b6efaad48be1c72275680e9aeaa1bf41297df