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
See bug for more context. Test: flash device Bug: 280951040 Change-Id: I21ba2a2177f88dbabea42915727f8c33aa0e23f8