[automerger skipped] Merge "DO NOT MERGE Add cross-user check for getDefaultSmsPackage()." into rvc-dev am: 6eb12245ef am: 98c35c4715 -s ours am: 53aa2d5bad -s ours am: 0dd2d5fd2a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987465 Change-Id: I7118505b1005ff8f243c13a8b13810a69b8cb4f3
This commit is contained in: