Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c am: 1a16975a36

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698

Change-Id: I0196d39d1e8d619a54931492fc89f15b8b5dfc99