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