[automerger skipped] DO NOT MERGE Add cross-user check for...

[automerger skipped] DO NOT MERGE Add cross-user check for getDefaultSmsPackage(). am: cf1bd25a am: 329bb590 -s ours am: 3e904837 -s ours am: 0e14b10b -s ours am: 5a5fc9e7 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987465

Change-Id: I9d5ae3c5f6fd2f669c3644e4e0d5bf3c5dcbc996