This fixes a bug where the picker is not using the correct user id and also ensures that the settings activity uses the correct user when launched. Test: flash & test w/ work profile Bug 322071206 Change-Id: I846593ff9ae320d9bb774e3e79ed9ef41f101ff5
Test: manual Bug: 281332256 Change-Id: I5f47aacc84e5abe739ecc3bbad474957334e7c91