[automerger skipped] DO NOT MERGE Add cross-user check for getDefaultSmsPackage(). am: cf1bd25a37 am: 329bb590a9 -s ours am: 3e9048372c -s ours am: af8cec0ab5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987465 Change-Id: I0250f30b7aca4f0b95fc7819b7780b21f46afe23
This commit is contained in: