[automerger skipped] Merge "DO NOT MERGE Add cross-user check for...

[automerger skipped] Merge "DO NOT MERGE Add cross-user check for getDefaultSmsPackage()." into rvc-dev am: 6eb12245 am: 84d09ab4 -s ours am: ee82ff1f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987465

Change-Id: I169b12920d1ae0130d4f77e474fb71e87a7b2f1b