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

* changes:
  [automerger skipped] Merge "DO NOT MERGE Add cross-user check for getDefaultSmsPackage()." into qt-dev am: 71ee3123 am: 538b54a1 -s ours am: 435e40f3 -s ours am: 4042304c -s ours am: a6d89f27 -s ours am: b6bacd01 -s ours
  [automerger skipped] DO NOT MERGE Add cross-user check for getDefaultSmsPackage(). am: 0abccabf am: bd70751b -s ours am: 64e7a725 -s ours am: 750c4286 -s ours am: fab99752 -s ours am: 725c7ba7 -s ours