[automerger skipped] Merge "DO NOT MERGE Add cross-user check for getDefaultSmsPackage()." into qt-dev am: 71ee31239e am: 538b54a115 -s ours am: 435e40f399 -s ours am: 1adb574d86 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987346 Change-Id: I04ae67469045936ecd2d9ae23388454954ca2de2
This commit is contained in: