Merge "Fix "launcher starting on work profile"" into oc-dev
am: b6d1a19819

Change-Id: Id1e6bdc951b0c139406195af378ccdfa21730d12