Merge "DO NOT MERGE Add cross-user check for getDefaultSmsPackage()." into rvc-dev