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