[automerger skipped] Merge "Refactor SmsManager not to use ActivityThread hidden API in Mainline" am: 419caebfc9 am: bee019ac53 am: cc9c5b3297 -s ours
am skip reason: Change-Id I0a5ca7699c969585ea08c82ea7cafd26a73c08f9 with SHA-1 24fded67fb is in history

Change-Id: Ia28d29389cd62836dfef8a6f3dd1ce5880427c2f