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