Merge changes from topic "am-8ae17265364948708d11f05eba2d8996" into sc-v2-dev-plus-aosp

* changes:
  [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: acb2581c -s ours
  [automerger skipped] DO NOT MERGE Add cross-user check for getDefaultSmsPackage(). am: cf1bd25a am: 329bb590 -s ours am: 3e904837 -s ours am: af8cec0a -s ours