[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: aa2d4b75e1 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987346 Change-Id: Ic7bd40adeb6e2ab6207f074e960d3a9294ae86da
This commit is contained in: