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

[automerger skipped] Merge "DO NOT MERGE Add cross-user check for getDefaultSmsPackage()." into qt-dev am: 71ee3123 am: 538b54a1 -s ours am: 435e40f3 -s ours am: 4042304c -s ours am: a6d89f27 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icfa34b2e3156f8e0899482806b7bcbd8d38b31db