[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: 5861d3d3 -s ours am: 31554e8b -s ours am: 6c8698a6 -s ours am: 05611009 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9ff7f3e14dec2aa33149c190b3a3f7aca54038a1