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