[automerger skipped] Merge "Un-deprecate SmsManager APIs" am: 2827393816 am: 02dd966131 -s ours
am skip reason: Change-Id I9714719f2d922cb027fa42a1aa535006dce7342c with SHA-1 ac3eb46325 is in history
Change-Id: I1c3e2fd24ffc83f3a7d3b732dcf9fc72553542b3
This commit is contained in: