[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: 98c35c47 -s ours am: 53aa2d5b -s ours am: 0dd2d5fd -s ours am: 03043f8d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifd4ba73ca9330c2444a8472d810321d27a5d0d3c