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

[automerger skipped] DO NOT MERGE Add cross-user check for getDefaultSmsPackage(). am: 0abccabf am: bd70751b -s ours am: 64e7a725 -s ours am: 750c4286 -s ours am: fab99752 -s ours am: 440b63f4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I23b52b07d6e02fa3c58f80baf1c8d25cb79a58ac