[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: 1adb574d -s ours am: aa2d4b75 -s ours am: c9a076a8 -s ours am: e9a33c05 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibbc28d0dde8225e9d9ae1a611a89636138bcdf2b